diff options
Diffstat (limited to 'todolists/views.py')
| -rw-r--r-- | todolists/views.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/todolists/views.py b/todolists/views.py index cce92a6c..3a96dc87 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -1,17 +1,15 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404 -from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib.auth.decorators import user_passes_test from django.contrib.auth.models import User -from archweb_dev.lib.utils import render_response -from archweb_dev.todolists.models import Todolist, TodolistPkg -from archweb_dev.packages.models import Package +from archweb_dev.main.utils import render_response +from archweb_dev.main.models import Todolist, TodolistPkg, Package +from archweb_dev.main.models import Arch, Repo # FIXME: ugly hackery. http://code.djangoproject.com/ticket/3450 import django.db IntegrityError = django.db.backend.Database.IntegrityError -@login_required -#@is_maintainer def flag(request, listid, pkgid): list = get_object_or_404(Todolist, id=listid) pkg = get_object_or_404(TodolistPkg, id=pkgid) @@ -19,21 +17,21 @@ def flag(request, listid, pkgid): pkg.save() return HttpResponseRedirect('/todo/%s/' % (listid)) -@login_required def view(request, listid): list = get_object_or_404(Todolist, id=listid) pkgs = TodolistPkg.objects.filter(list=list.id).order_by('pkg') - return render_response(request, 'todolists/view.html', {'list':list,'pkgs':pkgs}) + return render_response( + request, + 'todolists/view.html', + {'list':list,'pkgs':pkgs}) -@login_required def list(request): lists = Todolist.objects.order_by('-date_added') for l in lists: - l.complete = TodolistPkg.objects.filter(list=l.id,complete=False).count() == 0 + l.complete = TodolistPkg.objects.filter( + list=l.id,complete=False).count() == 0 return render_response(request, 'todolists/list.html', {'lists':lists}) -@login_required -#@is_maintainer @user_passes_test(lambda u: u.has_perm('todolists.add_todolist')) def add(request): if request.POST: @@ -50,7 +48,8 @@ def add(request): todo.save() # now link in packages for p in request.POST.get('packages').split("\n"): - for pkg in Package.objects.filter(pkgname=p.strip()): + for pkg in Package.objects.filter( + pkgname=p.strip()).order_by('arch'): todopkg = TodolistPkg( list = todo, pkg = pkg) |