Skip to content

Fix message on "Mark as" confirmation page #19363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashb merged 3 commits into from
Nov 3, 2021
Merged

Fix message on "Mark as" confirmation page #19363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe811f
Fix message on "Mark as" confirmation page
ashb Nov 2, 2021
b119565
fixup! Fix message on "Mark as" confirmation page
ashb Nov 2, 2021
0e1377b
fixup! Fix message on "Mark as" confirmation page
ashb Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airflow/www/templates/airflow/_messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
#}
{%- macro message(content, category='info', dismissable=true) -%}
{%- macro show_message(content, category='info', dismissible=true) -%}
<div class="alert alert-{{ category }}">
{%- if dismissable -%}
{%- if dismissible -%}
<button type="button" class="close" data-dismiss="alert">&times;</button>
{%- endif -%}
{%- if caller is defined -%}
Expand Down
10 changes: 5 additions & 5 deletions airflow/www/templates/airflow/dags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

{% extends base_template %}
{% from 'appbuilder/loading_dots.html' import loading_dots %}
{% from 'airflow/_messages.html' import message %}
{% from 'airflow/_messages.html' import show_message %}

{% block page_title %}
{% if search_query %}"{{ search_query }}" - {% endif %}DAGs - {{ appbuilder.app_name }}
Expand Down Expand Up @@ -50,10 +50,10 @@

{% block messages %}
{% for m in dashboard_alerts %}
{{ message(m.message, m.category) }}
{{ show_message(m.message, m.category) }}
Comment thread
ashb marked this conversation as resolved.
{% endfor %}
{% for original_table_name, moved_table_name in migration_moved_data_alerts %}
{% call message(category='error', dismissable=false) %}
{% call show_message(category='error', dismissible=false) %}
Airflow found incompatible data in the <code>{{ original_table_name }}</code> table in the
metadatabase, and has moved them to <code>{{ moved_table_name }}</code> during the database migration
to upgrade. Please inspect the moved data to decide whether you need to keep them, and manually drop
Expand All @@ -62,14 +62,14 @@
{% endfor %}
{{ super() }}
{% if sqlite_warning | default(true) %}
{% call message(category='warning', dismissable=false) %}
{% call show_message(category='warning', dismissible=false) %}
Do not use <b>SQLite</b> as metadata DB in production &#8211; it should only be used for dev/testing
We recommend using Postgres or MySQL.
<a href={{ get_docs_url("howto/set-up-database.html") }}><b>Click here</b></a> for more information.
{% endcall %}
{% endif %}
{% if sequential_executor_warning | default(false) %}
{% call message(category='warning', dismissable=false) %}
{% call show_message(category='warning', dismissible=false) %}
Do not use <b>SequentialExecutor</b> in production.
<a href={{ get_docs_url("executor/index.html") }}><b>Click here</b></a> for more information.
{% endcall %}
Expand Down
6 changes: 3 additions & 3 deletions airflow/www/templates/airflow/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#}

{% extends 'appbuilder/baselayout.html' %}
{% from 'airflow/_messages.html' import message %}
{% from 'airflow/_messages.html' import show_message %}

{% block page_title -%}
{% if title is defined -%}
Expand Down Expand Up @@ -52,7 +52,7 @@
{% block messages %}
{% include 'appbuilder/flash.html' %}
{% if scheduler_job is defined and (not scheduler_job or not scheduler_job.is_alive()) %}
{% call message(category='warning', dismissable=false) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The scheduler does not appear to be running.
{% if scheduler_job %}
Last heartbeat was received
Expand All @@ -67,7 +67,7 @@
{% endcall %}
{% endif %}
{% if triggerer_job is defined and (not triggerer_job or not triggerer_job.is_alive()) %}
{% call message(category='warning', dismissable=false) %}
{% call show_message(category='warning', dismissible=false) %}
<p>The triggerer does not appear to be running.
{% if triggerer_job %}
Last heartbeat was received
Expand Down
2 changes: 1 addition & 1 deletion airflow/www/templates/appbuilder/flash.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{{ dag_import_errors.append((category, m)) if dag_import_errors.append((category, m)) != None else '' }}
{% elif not (request.path == appbuilder.get_url_for_login and 'access is denied' in m.lower()) %}
{# Don't show 'Access is Denied' alert if user is logged out and on the login page. #}
{{ message(m, category) }}
{{ show_message(m, category) }}
{% endif %}
{% endfor %}
{% endif %}
Expand Down