diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-23 13:14:05 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-23 13:14:05 -0600 |
| commit | 0aa246b85159bf627873308868cf169868cba569 (patch) | |
| tree | 0fd52aebc6ab0d3d5eff592d00ff10fe920bb035 /todolists | |
| parent | 55b776d58999412cd6bf0787a41d6ab00bf80fb6 (diff) | |
| parent | 31bc66e23c2ea0467d2201b86536f161fd1f32ca (diff) | |
Merge branch 'archweb' into archweb-generic2
Diffstat (limited to 'todolists')
| -rw-r--r-- | todolists/models.py | 3 | ||||
| -rw-r--r-- | todolists/views.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/todolists/models.py b/todolists/models.py index 3ea80f37..59b14616 100644 --- a/todolists/models.py +++ b/todolists/models.py @@ -47,7 +47,8 @@ class Todolist(models.Model): if not hasattr(self, '_packages'): self._packages = self.todolistpackage_set.filter( removed__isnull=True).select_related( - 'pkg', 'repo', 'arch').order_by('pkgname', 'arch') + 'pkg', 'repo', 'arch', 'user__username').order_by( + 'pkgname', 'arch') return self._packages diff --git a/todolists/views.py b/todolists/views.py index b6d3c25f..6c117473 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -72,12 +72,13 @@ def view(request, slug): 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', { + context = { 'list': todolist, 'svn_roots': svn_roots, 'arches': sorted(arches), 'repos': sorted(repos), - }) + } + return render(request, 'todolists/view.html', context) def list_pkgbases(request, slug, svn_root): |