From 9c3000f572d4b6749e9eaee400f8d04a0b61f45f Mon Sep 17 00:00:00 2001
From: Scot Hacker <shacker@birdhouse.org>
Date: Thu, 28 Jul 2016 00:13:51 -0700
Subject: [PATCH] Fix list view when lists in different groups have same slug -
 Also fix bad messages when deleting items from lists

---
 todo/templates/todo/view_list.html | 6 +++---
 todo/views.py                      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/todo/templates/todo/view_list.html b/todo/templates/todo/view_list.html
index 4c03c34..33f586d 100644
--- a/todo/templates/todo/view_list.html
+++ b/todo/templates/todo/view_list.html
@@ -118,7 +118,7 @@
             	</table>
 
                 <p><input type="submit" name="mark_tasks_done" value="Continue..."  class="todo-button"></p>
-                <p><a  class="todo" href="{% url 'todo-completed_tasks' list_id list_slug %}">View completed tasks</a></p>
+                <p><a  class="todo" href="{% url 'todo-completed_tasks' list.id list_slug %}">View completed tasks</a></p>
 
             {% else %}
 
@@ -153,12 +153,12 @@
             	</table>
             	<p><input type="submit" name="deldonetasks" value="Continue..."  class="todo-button"></p>
             	</form>
-                <p><a class="todo" href="{% url 'todo-incomplete_tasks' list_id list_slug %}">View incomplete tasks</a></p>
+                <p><a class="todo" href="{% url 'todo-incomplete_tasks' list.id list_slug %}">View incomplete tasks</a></p>
             {% endif %}
 
     	{% if user.is_staff %}
         	{% if list_slug != "mine" %}
-        	   <p><a class="todo" href="{% url 'todo-del_list' list_id list_slug %}">Delete this list</a></p>
+        	   <p><a class="todo" href="{% url 'todo-del_list' list.id list_slug %}">Delete this list</a></p>
         	{% endif %}
     	{% endif %}
 
diff --git a/todo/views.py b/todo/views.py
index f730e8b..0e2ecbd 100644
--- a/todo/views.py
+++ b/todo/views.py
@@ -91,7 +91,7 @@ def view_list(request, list_id=0, list_slug=None, view_completed=False):
     if list_slug == "mine" or list_slug == "recent-add" or list_slug == "recent-complete":
         auth_ok = True
     else:
-        list = get_object_or_404(List, slug=list_slug)
+        list = get_object_or_404(List, id=list_id)
         listid = list.id
 
         if list.group in request.user.groups.all() or request.user.is_staff or list_slug == "mine":
@@ -120,10 +120,10 @@ def view_list(request, list_id=0, list_slug=None, view_completed=False):
 
     # And delete any requested items
     if request.POST.getlist('del_task'):
-        deleted_items = request.POST.getlist('del_task')
-        for item in deleted_items:
-            Item.objects.get(id=item).delete()
+        for item_id in request.POST.getlist('del_task'):
+            i = Item.objects.get(id=item_id)
             messages.success(request, "Item \"{i}\" deleted.".format(i=i.title))
+            i.delete()
 
     # Delete any already-completed items
     if request.POST.getlist('del_completed_task'):