public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix list view when lists in different groups have same slug

Browse source 
- Also fix bad messages when deleting items from lists
This commit is contained in:
Scot Hacker 2016-07-28 00:13:51 -07:00
parent 1b92e8dea6
commit 9c3000f572
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
todo/templates/todo/view_list.html
View file

@ -118,7 +118,7 @@
</table> </table>
<p><input type="submit" name="mark_tasks_done" value="Continue..." class="todo-button"></p> <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 %} {% else %}
@ -153,12 +153,12 @@
</table> </table>
<p><input type="submit" name="deldonetasks" value="Continue..." class="todo-button"></p> <p><input type="submit" name="deldonetasks" value="Continue..." class="todo-button"></p>
</form> </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 %} {% endif %}
{% if user.is_staff %} {% if user.is_staff %}
{% if list_slug != "mine" %} {% 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 %}
{% endif %} {% endif %}

8
todo/views.py
View file

@ -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": if list_slug == "mine" or list_slug == "recent-add" or list_slug == "recent-complete":
auth_ok = True auth_ok = True
else: else:
list = get_object_or_404(List, slug=list_slug) list = get_object_or_404(List, id=list_id)
listid = list.id listid = list.id
if list.group in request.user.groups.all() or request.user.is_staff or list_slug == "mine": 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 # And delete any requested items
if request.POST.getlist('del_task'): if request.POST.getlist('del_task'):
deleted_items = request.POST.getlist('del_task') for item_id in request.POST.getlist('del_task'):
for item in deleted_items: i = Item.objects.get(id=item_id)
Item.objects.get(id=item).delete()
messages.success(request, "Item \"{i}\" deleted.".format(i=i.title)) messages.success(request, "Item \"{i}\" deleted.".format(i=i.title))
i.delete()
# Delete any already-completed items # Delete any already-completed items
if request.POST.getlist('del_completed_task'): if request.POST.getlist('del_completed_task'):