From 85807311ca5545ea5e9d5a0170cf816269982348 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 5 Jul 2010 22:22:19 -0500 Subject: Show incomplete todo list packages in dev dashboard Implements FS#20081. Signed-off-by: Dan McGee --- devel/views.py | 13 +++++++++---- templates/devel/index.html | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/devel/views.py b/devel/views.py index 4215c0d8..c600f089 100644 --- a/devel/views.py +++ b/devel/views.py @@ -9,7 +9,7 @@ from django.core.mail import send_mail from django.db.models import Q from django.views.decorators.cache import never_cache -from main.models import Package, Todolist +from main.models import Package, Todolist, TodolistPkg from main.models import Arch, Repo from main.models import UserProfile, News from main.models import Mirror @@ -25,14 +25,19 @@ pwletters = ascii_letters + digits def index(request): '''the Developer dashboard''' inner_q = PackageRelation.objects.filter(user=request.user).values('pkgbase') - packages = Package.objects.select_related('arch', 'repo').filter(needupdate=True) - packages = packages.filter(pkgbase__in=inner_q) + flagged = Package.objects.select_related('arch', 'repo').filter(needupdate=True) + flagged = flagged.filter(pkgbase__in=inner_q) + + todopkgs = TodolistPkg.objects.select_related( + 'pkg', 'pkg__arch', 'pkg__repo').filter(complete=False) + todopkgs = todopkgs.filter(pkg__pkgbase__in=inner_q) page_dict = { 'todos': Todolist.objects.incomplete(), 'repos': Repo.objects.all(), 'arches': Arch.objects.all(), 'maintainers': User.objects.filter(is_active=True).order_by('last_name'), - 'flagged' : packages, + 'flagged' : flagged, + 'todopkgs' : todopkgs, } return render_to_response('devel/index.html', diff --git a/templates/devel/index.html b/templates/devel/index.html index d2dd155d..cba9e761 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -60,6 +60,35 @@ +

My Incomplete Todo List Packages

+ + + + + + + + + + + + + {% for todopkg in todopkgs %} + + + + + + + + {% empty %} + + {% endfor %} + +
Todo ListNameRepoArchMaintainer(s)
{{ todopkg.list.name }}{{ todopkg.pkg.pkgname }}{{ todopkg.pkg.repo.name }}{{ todopkg.pkg.arch.name }}{{ todopkg.pkg.maintainers|join:', ' }}
No incomplete todo list packages to display
+
{% csrf_token %}