summaryrefslogtreecommitdiff
path: root/todolists
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-01-25 09:54:24 -0700
committerDan McGee <dan@archlinux.org>2013-01-25 09:54:24 -0700
commit4244ff7a42566949f8ee85e922ed48f4a80407f7 (patch)
tree21caf4d67aa36d06c6a921608901ad059752e744 /todolists
parentf9252df1138ae388168cf76cb3d654a2abbce4ec (diff)
parentdc6cc49f6f876983f76f5f8c05a2285801f27ea0 (diff)
Merge branch 'on-the-plane'release_2013-01-25
Diffstat (limited to 'todolists')
-rw-r--r--todolists/utils.py19
-rw-r--r--todolists/views.py3
2 files changed, 21 insertions, 1 deletions
diff --git a/todolists/utils.py b/todolists/utils.py
index e86d9054..51a75a3c 100644
--- a/todolists/utils.py
+++ b/todolists/utils.py
@@ -2,6 +2,7 @@ from django.db import connections, router
from django.db.models import Count
from .models import Todolist, TodolistPackage
+from packages.models import Package
def todo_counts():
@@ -36,4 +37,22 @@ def get_annotated_todolists(incomplete_only=False):
return lists
+
+def attach_staging(packages, list_id):
+ '''Look for any staging version of the packages provided and attach them
+ to the 'staging' attribute on each package if found.'''
+ pkgnames = TodolistPackage.objects.filter(
+ todolist_id=list_id).values('pkgname')
+ staging_pkgs = Package.objects.normal().filter(repo__staging=True,
+ pkgname__in=pkgnames)
+ # now build a lookup dict to attach to the correct package
+ lookup = {(p.pkgname, p.arch): p for p in staging_pkgs}
+
+ annotated = []
+ for package in packages:
+ in_staging = lookup.get((package.pkgname, package.arch), None)
+ package.staging = in_staging
+
+ return annotated
+
# vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index fcf62e23..f333728a 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -16,7 +16,7 @@ from main.models import Package, Repo
from main.utils import find_unique_slug
from packages.utils import attach_maintainers
from .models import Todolist, TodolistPackage
-from .utils import get_annotated_todolists
+from .utils import get_annotated_todolists, attach_staging
class TodoListForm(forms.ModelForm):
@@ -69,6 +69,7 @@ def view(request, slug):
# we don't hold onto the result, but the objects are the same here,
# so accessing maintainers in the template is now cheap
attach_maintainers(todolist.packages())
+ attach_staging(todolist.packages(), todolist.pk)
arches = {tp.arch for tp in todolist.packages()}
repos = {tp.repo for tp in todolist.packages()}
return render(request, 'todolists/view.html', {