From 719f317582f7c8842f9bd1b133972d1c49b12e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Thu, 14 Aug 2014 20:23:42 -0700
Subject: [PATCH] confirm label & milestone deletion

---
 issue/templates/issue/label_list.html     | 2 +-
 issue/templates/issue/milestone_list.html | 2 +-
 issue/views.py                            | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/issue/templates/issue/label_list.html b/issue/templates/issue/label_list.html
index 3ea5b05..3e2dc18 100644
--- a/issue/templates/issue/label_list.html
+++ b/issue/templates/issue/label_list.html
@@ -31,7 +31,7 @@
           <a href="{% url 'edit-label' project.name label.id %}" class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</a>
           {% endif %}
           {% if perm.delete_tags %}
-          <a href="{% url 'delete-label' project.name label.id %}" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</a>
+          <a href="{% url 'delete-label' project.name label.id %}?prev={{ request.path }}" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</a>
           {% endif %}
         </div>
         {% endif %}
diff --git a/issue/templates/issue/milestone_list.html b/issue/templates/issue/milestone_list.html
index 2e41fa1..e9d8d13 100644
--- a/issue/templates/issue/milestone_list.html
+++ b/issue/templates/issue/milestone_list.html
@@ -36,7 +36,7 @@
           <a href="{% url 'edit-milestone' project.name milestone.name %}"><button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
           {% endif %}
           {% if perm.delete_tags %}
-          <a href="{% url 'delete-milestone' project.name milestone.name %}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
+          <a href="{% url 'delete-milestone' project.name milestone.name %}?prev={{ request.path }}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
           {% endif %}
         </div>
         <b style="font-size: 200%;">
diff --git a/issue/views.py b/issue/views.py
index c3c6f78..bbe00f4 100644
--- a/issue/views.py
+++ b/issue/views.py
@@ -635,6 +635,7 @@ def label_edit(request, project, id=None):
 
 
 @project_perm_required('delete_tags')
+@confirmation_required('Are you sure to delete this label?')
 def label_delete(request, project, id):
 
     label = get_object_or_404(Label, project=project, id=id)
@@ -755,6 +756,7 @@ def milestone_reopen(request, project, name):
 
 
 @project_perm_required('delete_tags')
+@confirmation_required('Are you sure to delete this milestone?')
 def milestone_delete(request, project, name):
 
     milestone = get_object_or_404(Milestone, project=project, name=name)