diff options
| -rw-r--r-- | templates/todolists/view.html | 10 | ||||
| -rw-r--r-- | todolists/views.py | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 8fe6014..c8a3e9b 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -32,7 +32,7 @@ {% endblock %} {% block content %} <div class="greybox"> - <h3 class="title">ToDo List: {{ list.name }}</h2> + <h2 class="title">ToDo List: {{ list.name }}</h2> <table id="todotable" class="results" width="100%"> <thead> <tr> @@ -48,10 +48,10 @@ {% for pkg in pkgs %} <tr class="{% cycle even,odd %}"> <td><a href="/packages/{{ pkg.pkg.id }}/">{{ pkg.pkg.id }}</a></td> - <td>{{ pkg.pkg.arch.name }}</td> - <td>{{ pkg.pkg.repo.name }}</td> - <td>{{ pkg.pkg.pkgname }}</td> - <td>{{ pkg.pkg.maintainer.get_full_name }}</td> + <td>{{ pkg.pkg.get_arch_display }}</td> + <td>{{ pkg.pkg.get_repo_display }}</td> + <td>{{ pkg.pkg.pkgname }}</td> + <td>{{ pkg.pkg.maintainer.get_full_name|default:"Orphan" }}</td> <td> {% if pkg.complete %} <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:blue">Complete</span></a> diff --git a/todolists/views.py b/todolists/views.py index dbfd440..9a4fdb9 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -10,7 +10,6 @@ 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) @@ -22,17 +21,20 @@ def flag(request, listid, pkgid): 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: @@ -49,7 +51,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()).order_by('arch'): + for pkg in Package.objects.filter( + pkgname=p.strip()).order_by('arch'): todopkg = TodolistPkg( list = todo, pkg = pkg) |