From 9382d125246c8bbd7528cb99fa9aac5944c93f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Sat, 16 Aug 2014 00:56:24 -0700
Subject: [PATCH] Revert "confirm before project deletion"

This reverts commit 790ddd158b0784e031ea044d5fbd7dc531dafaf2.

Conflicts:
	issue/decorators.py
---
 issue/decorators.py                | 30 ---------------------------
 issue/templates/confirm.html       | 33 ------------------------------
 issue/templates/issue/project.html |  2 +-
 issue/tests.py                     |  6 ------
 issue/views.py                     |  3 +--
 5 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 issue/templates/confirm.html

diff --git a/issue/decorators.py b/issue/decorators.py
index a0868e4..1d69dcf 100644
--- a/issue/decorators.py
+++ b/issue/decorators.py
@@ -2,8 +2,6 @@ from functools import wraps
 
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseForbidden
-from django.shortcuts import render
-from django.core.urlresolvers import reverse
 
 from issue.models import Project
 
@@ -26,31 +24,3 @@ def project_perm_required(perm):
         return wrapper
 
     return decorator
-
-def confirmation_required(message, prev=None):
-
-    def decorator(view):
-        @wraps(view)
-        def wrapper(request, *args, **kwargs):
-            if request.GET.get('force'):
-                return view(request, *args, **kwargs)
-            previous = request.GET.get('prev')
-            if not previous:
-                if prev:
-                    previous = reverse(prev)
-                else:
-                    # improvising
-                    if hasattr(request, 'project'):
-                        previous = reverse('list-issue',
-                            args=[request.project.name])
-                    else:
-                        previous = reverse('list-project')
-            c = {
-                'message': message,
-                'prev': previous,
-                'next': request.path + '?force=1',
-            }
-            return render(request, 'confirm.html', c)
-        return wrapper
-
-    return decorator
diff --git a/issue/templates/confirm.html b/issue/templates/confirm.html
deleted file mode 100644
index 71d335f..0000000
--- a/issue/templates/confirm.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends 'base.html' %}
-
-{% load bootstrap_tags %}
-
-{% block content %}
-
-<div class="panel panel-default">
-
-  <div class="panel-heading">
-    <h1>
-      Confirmation required
-    </h1>
-  </div>
-
-  <div class="panel-body">
-    <div class="col-md-offset-3 col-md-6">
-      <div class="alert alert-danger">
-        {{ message }}
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-          <a href="{{ next }}" class="btn btn-primary btn-block">Confirm</a>
-        </div>
-        <div class="col-md-6">
-          <a href="{{ prev }}" class="btn btn-default btn-block">Cancel</a>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</div>
-
-{% endblock %}
diff --git a/issue/templates/issue/project.html b/issue/templates/issue/project.html
index 881946b..7e33b86 100644
--- a/issue/templates/issue/project.html
+++ b/issue/templates/issue/project.html
@@ -13,7 +13,7 @@
 <li role="presentation"><a role="menuitem" tabindex="-1" href="{% url 'edit-project' project.name %}">Modify this project</a></li>
 {% endif %}
 {% if perm.delete_project %}
-<li role="presentation"><a role="menuitem" tabindex="-1" href="{% url 'delete-project' project.name %}?prev={{ request.get_full_path }}">Delete this project</a></li>
+<li role="presentation"><a role="menuitem" tabindex="-1" href="{% url 'delete-project' project.name %}">Delete this project</a></li>
 {% endif %}
 {% if perm.create_project %}
 <li role="presentation"><a role="menuitem" tabindex="-1" href="{% url 'add-project' %}">New project…</a></li>
diff --git a/issue/tests.py b/issue/tests.py
index c554ea6..dd5df8b 100644
--- a/issue/tests.py
+++ b/issue/tests.py
@@ -266,12 +266,6 @@ class TestProjectsViews(TestCase):
         expected_url = reverse('list-project')
         url = reverse('delete-project', args=['project-1'])
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, 'Are you sure')
-        self.assertQuerysetEqual(Project.objects.all(),
-            ['project-1', 'project-2'], lambda x: x.name, ordered=False)
-        url = reverse('delete-project', args=['project-1']) + '?force=1'
-        response = self.client.get(url)
         self.assertRedirects(response, expected_url)
         self.assertQuerysetEqual(Project.objects.all(),
             ['project-2'], lambda x: x.name, ordered=False)
diff --git a/issue/views.py b/issue/views.py
index f91a8d3..65ed0b9 100644
--- a/issue/views.py
+++ b/issue/views.py
@@ -6,7 +6,7 @@ from django.http import Http404, HttpResponseForbidden
 
 from issue.models import *
 from issue.forms import *
-from issue.decorators import *
+from issue.decorators import project_perm_required
 
 import shlex
 
@@ -233,7 +233,6 @@ def project_edit(request, project):
 
 
 @project_perm_required('delete_project')
-@confirmation_required('Are you sure to delete this project?')
 def project_delete(request, project):
 
     project.delete()