summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreliott <eliott@cactuswax.net>2008-04-05 13:42:01 -0700
committereliott <eliott@cactuswax.net>2008-04-05 13:42:01 -0700
commit4184dae7c46a95ede489f7b20b5befc69b3a20ba (patch)
treede84b7e2341b73df254981091eae1a96dadf7087
parent5f48dda94b593feefd906a7aa495427c870d6db9 (diff)
small fix to todolists
-rw-r--r--templates/todolists/view.html10
-rw-r--r--todolists/views.py13
2 files changed, 13 insertions, 10 deletions
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 8fe60144..c8a3e9bb 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 dbfd440e..9a4fdb95 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)