You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ma...@apache.org on 2018/05/23 18:46:21 UTC
incubator-airflow git commit: [AIRFLOW-2419] Use default view for
subdag operator
Repository: incubator-airflow
Updated Branches:
refs/heads/master 62b95f8bc -> f1ac67bdc
[AIRFLOW-2419] Use default view for subdag operator
Closes #3314 from milanvdm/milanvdm/subdag_view
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f1ac67bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f1ac67bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f1ac67bd
Branch: refs/heads/master
Commit: f1ac67bdc6649944d34e6568ae64c6a376dc22cd
Parents: 62b95f8
Author: milanvdm <mi...@hotmail.com>
Authored: Wed May 23 11:46:13 2018 -0700
Committer: Maxime Beauchemin <ma...@gmail.com>
Committed: Wed May 23 11:46:13 2018 -0700
----------------------------------------------------------------------
airflow/www/templates/airflow/dag.html | 4 ++--
airflow/www_rbac/templates/airflow/dag.html | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f1ac67bd/airflow/www/templates/airflow/dag.html
----------------------------------------------------------------------
diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html
index 18242d3..adb2d38 100644
--- a/airflow/www/templates/airflow/dag.html
+++ b/airflow/www/templates/airflow/dag.html
@@ -49,7 +49,7 @@
<div>
<ul class="nav nav-pills">
{% if dag.parent_dag %}
- <li class="never_active"><a href="{{ url_for("airflow.graph", dag_id=dag.parent_dag.dag_id) }}">
+ <li class="never_active"><a href="{{ url_for('airflow.' + dag.default_view, dag_id=dag.parent_dag.dag_id) }}">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
Back to {{ dag.parent_dag.dag_id }}</a>
</li>
@@ -311,7 +311,7 @@ function updateQueryStringParameter(uri, key, value) {
});
$("#btn_subdag").click(function(){
- url = "{{ url_for('airflow.graph') }}" +
+ url = "{{ url_for( 'airflow.' + dag.default_view ) }}" +
"?dag_id=" + encodeURIComponent(subdag_id) +
"&execution_date=" + encodeURIComponent(execution_date);
window.location = url;
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f1ac67bd/airflow/www_rbac/templates/airflow/dag.html
----------------------------------------------------------------------
diff --git a/airflow/www_rbac/templates/airflow/dag.html b/airflow/www_rbac/templates/airflow/dag.html
index 35308be..eb44908 100644
--- a/airflow/www_rbac/templates/airflow/dag.html
+++ b/airflow/www_rbac/templates/airflow/dag.html
@@ -48,7 +48,7 @@
<div>
<ul class="nav nav-pills">
{% if dag.parent_dag %}
- <li class="never_active"><a href="{{ url_for("Airflow.graph", dag_id=dag.parent_dag.dag_id) }}">
+ <li class="never_active"><a href="{{ url_for('Airflow.' + dag.default_view, dag_id=dag.parent_dag.dag_id) }}">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
Back to {{ dag.parent_dag.dag_id }}</a>
</li>
@@ -309,7 +309,7 @@ function updateQueryStringParameter(uri, key, value) {
});
$("#btn_subdag").click(function(){
- url = "{{ url_for('Airflow.graph') }}" +
+ url = "{{ url_for( 'Airflow.' + dag.default_view ) }}" +
"?dag_id=" + encodeURIComponent(subdag_id) +
"&execution_date=" + encodeURIComponent(execution_date);
window.location = url;