summaryrefslogtreecommitdiff
path: root/packages/admin.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
commitb2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch)
tree2355b55efce971b6c7044b1f04b4a3730d2da50f /packages/admin.py
parent0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff)
parentfab8d437929fce202b11707e1cacbc079f61edbc (diff)
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes Conflicts: templates/news/list.html templates/public/index.html
Diffstat (limited to 'packages/admin.py')
-rw-r--r--packages/admin.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/admin.py b/packages/admin.py
index 820bbb29..4680c755 100644
--- a/packages/admin.py
+++ b/packages/admin.py
@@ -20,7 +20,7 @@ class FlagRequestAdmin(admin.ModelAdmin):
ordering = ('-created',)
date_hierarchy = 'created'
- def queryset(self, request):
+ def get_queryset(self, request):
qs = super(FlagRequestAdmin, self).queryset(request)
return qs.select_related('repo', 'user')
@@ -42,7 +42,7 @@ class SignoffSpecificationAdmin(admin.ModelAdmin):
ordering = ('-created',)
date_hierarchy = 'created'
- def queryset(self, request):
+ def get_queryset(self, request):
qs = super(SignoffSpecificationAdmin, self).queryset(request)
return qs.select_related('arch', 'repo', 'user')