From 9070fb79dd641e7c3499628acecd1695d43d68a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Mon, 24 Dec 2012 09:35:59 +0100
Subject: [PATCH] Request confirmation before deleting one item

---
 templates/category.html  | 2 +-
 templates/tag.html       | 2 +-
 templates/view_blog.html | 4 ++--
 views.py                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/category.html b/templates/category.html
index 4e8dfac..9fb7fb9 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -7,7 +7,7 @@
 {% else %}
 <table>
 {% for category in categories %}
-    <tr><td>{{ category.id }}</td><td>{{ category.name }}</td><td><a href="/category/edit/{{ category.id }}">Edit</a></td><td><a href="/category/delete/{{ category.id }}">Delete</a></td></tr>
+    <tr><td>{{ category.id }}</td><td>{{ category.name }}</td><td><a href="/category/edit/{{ category.id }}">Edit</a></td><td><a href="/category/delete/{{ category.id }}" onclick="return confirm('Do you really want to delete this item ?')">Delete</a></td></tr>
 {% endfor %}
 </table>
 {% endif %}
diff --git a/templates/tag.html b/templates/tag.html
index 3341a4d..21ec95f 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -7,7 +7,7 @@
 {% else %}
 <table>
 {% for tag in tags %}
-    <tr><td>{{ tag.id }}</td><td>{{ tag.name }}</td><td><a href="/tag/edit/{{ tag.id }}">Edit</a></td><td><a href="/tag/delete/{{ tag.id }}">Delete</a></td></tr>
+    <tr><td>{{ tag.id }}</td><td>{{ tag.name }}</td><td><a href="/tag/edit/{{ tag.id }}">Edit</a></td><td><a href="/tag/delete/{{ tag.id }}" onclick="return confirm('Do you really want to delete this item ?')">Delete</a></td></tr>
 {% endfor %}
 </table>
 {% endif %}
diff --git a/templates/view_blog.html b/templates/view_blog.html
index 3b98a8d..d0ae6f1 100644
--- a/templates/view_blog.html
+++ b/templates/view_blog.html
@@ -6,7 +6,7 @@
 <form action="/blog/edit/{{ blog.id }}" method="post">
 {% csrf_token %}
 {{ form.as_p }}
-<input type="submit" name="edit" value="Edit" /><input type="submit" name="delete" value="Delete" />
+<input type="submit" name="edit" value="Edit" /><input type="submit" name="delete" value="Delete"  onclick="return confirm('Do you really want to delete this item ?')"/>
 </form>
 {% endif %}
 <br/><br/>
@@ -19,7 +19,7 @@
 <table>
 {% for post in posts %}
 {% with post.id as cur_id %}
-    <tr><td><a href="/post/edit/{{ post.id }}">{{ post.id }}</a></td><td>{{ post.title }}</td><td>{{ post.category.name }}</td><td>{{ post.creation_date }}</td><td>{{ post.modification_date }}</td><td>{{ post.published }}</td><td>{{ post.front_page }}</td><td>{{ comments|hash:cur_id|default_if_none:"0" }} comment{{ comments|hash:cur_id|pluralize }}</td><td><a href="/post/delete/{{ post.id }}">Delete</a></td></tr>
+    <tr><td><a href="/post/edit/{{ post.id }}">{{ post.id }}</a></td><td>{{ post.title }}</td><td>{{ post.category.name }}</td><td>{{ post.creation_date }}</td><td>{{ post.modification_date }}</td><td>{{ post.published }}</td><td>{{ post.front_page }}</td><td>{{ comments|hash:cur_id|default_if_none:"0" }} comment{{ comments|hash:cur_id|pluralize }}</td><td><a href="/post/delete/{{ post.id }}" onclick="return confirm('Do you really want to delete this item ?')">Delete</a></td></tr>
     {% endwith %}
 {% endfor %}
 {% endif %}
diff --git a/views.py b/views.py
index c843abb..6407960 100644
--- a/views.py
+++ b/views.py
@@ -222,7 +222,7 @@ def edit_category(request, category_id):
             form = CategoryForm(request.POST, instance=category) # A form bound to the POST data
             if form.is_valid(): # All validation rules pass
                 if request.POST['name'] != name:
-                    category.remove()
+                    category.remove(b)
                 form.save()
             return HttpResponseRedirect('/category/' + str(b.id))
     else:
@@ -241,7 +241,7 @@ def delete_category(request, category_id):
 
     b,_ = have_I_right(request, category.blog.id)
 
-    category.remove()
+    category.remove(b)
     category.delete()
 
     return HttpResponseRedirect('/category/' + str(b.id))