From 71bb5c2da94f7613116607448fdeb385fbcd8779 Mon Sep 17 00:00:00 2001
From: Dan Davydov <ddavydov@twitter.com>
Date: Fri, 19 Oct 2018 10:33:41 -0400
Subject: [PATCH] [AIRFLOW-3233] Fix deletion of DAGs in the UI

---
 airflow/www/templates/airflow/dags.html      | 6 +++---
 airflow/www_rbac/templates/airflow/dags.html | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 0a7a6ec2a4791..642a856019274 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -191,11 +191,11 @@ <h2>DAGs</h2>
                 </a>
 
                 <!-- Delete -->
-                <a href="{{ url_for('airflow.delete', dag_id=dag.dag_id) }}"
-                  onclick="return confirmDeleteDag('{{ dag.safe_dag_id }}')">
+                <!-- Use dag_id instead of dag.dag_id, because the DAG might not exist in the webserver's DagBag -->
+                <a href="{{ url_for('airflow.delete', dag_id=dag_id) }}"
+                  onclick="return confirmDeleteDag('{{ dag_id }}')">
                    <span class="glyphicon glyphicon-remove-circle" style="color:red" aria-hidden="true" data-original-title="Delete Dag"></span>
                 </a>
-
                 </td>
             </tr>
         {% endfor %}
diff --git a/airflow/www_rbac/templates/airflow/dags.html b/airflow/www_rbac/templates/airflow/dags.html
index 5f492780d56ea..7d4fb5678dfd7 100644
--- a/airflow/www_rbac/templates/airflow/dags.html
+++ b/airflow/www_rbac/templates/airflow/dags.html
@@ -192,9 +192,10 @@ <h2>DAGs</h2>
                 </a>
 
                 <!-- Delete -->
-                <a href="{{ url_for('Airflow.delete', dag_id=dag.dag_id) }}"
-                   onclick="return confirmDeleteDag('{{ dag.safe_dag_id }}')">
-                  <span class="glyphicon glyphicon-remove-circle" style="color:red" aria-hidden="true" data-original-title="Delete Dag"></span>
+                <!-- Use dag_id instead of dag.dag_id, because the DAG might not exist in the webserver's DagBag -->
+                <a href="{{ url_for('Airflow.delete', dag_id=dag_id) }}"
+                  onclick="return confirmDeleteDag('{{ dag_id }}')">
+                   <span class="glyphicon glyphicon-remove-circle" style="color:red" aria-hidden="true" data-original-title="Delete Dag"></span>
                 </a>
                 </td>
             </tr>