From 58356ec5b38c71204895eb77856a45ffd7ac1725 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Nov 2013 16:07:49 -0500 Subject: Allow pkg_details_link to honor package flag state This allows the tag to be used in a few more places we weren't already able to use it, and hopefully speeds up rendering a tad on the package differences page. Signed-off-by: Dan McGee --- packages/templatetags/package_extras.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index f7392a96..3ce64748 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -67,13 +67,16 @@ def do_buildsortqs(parser, token): @register.simple_tag -def pkg_details_link(pkg, link_title=None): +def pkg_details_link(pkg, link_title=None, honor_flagged=False): if not pkg: return link_title or '' if link_title is None: link_title = pkg.pkgname + link_content = link_title + if honor_flagged and pkg.flag_date: + link_content = '%s' % link_title link = '%s' - return link % (pkg.get_absolute_url(), pkg.pkgname, link_title) + return link % (pkg.get_absolute_url(), pkg.pkgname, link_content) @register.simple_tag -- cgit v1.2.3-54-g00ecf From 429736f7e9fcdc92ea43f98e3a246b9e41e04707 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Nov 2013 17:05:02 -0500 Subject: Remove date_hierarchy from several package admin views I was never using this and it adds some pretty substantial overhead to each render of the admin page, so toss it. Add the simple date filter to the sidebar instead. Signed-off-by: Dan McGee --- packages/admin.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/admin.py b/packages/admin.py index 4680c755..5df0043a 100644 --- a/packages/admin.py +++ b/packages/admin.py @@ -15,10 +15,9 @@ class PackageRelationAdmin(admin.ModelAdmin): class FlagRequestAdmin(admin.ModelAdmin): list_display = ('pkgbase', 'full_version', 'repo', 'created', 'who', 'is_spam', 'is_legitimate', 'message') - list_filter = ('is_spam', 'is_legitimate', 'repo') + list_filter = ('is_spam', 'is_legitimate', 'repo', 'created') search_fields = ('pkgbase', 'user_email', 'message') ordering = ('-created',) - date_hierarchy = 'created' def get_queryset(self, request): qs = super(FlagRequestAdmin, self).queryset(request) @@ -28,19 +27,17 @@ def get_queryset(self, request): class SignoffAdmin(admin.ModelAdmin): list_display = ('pkgbase', 'full_version', 'arch', 'repo', 'user', 'created', 'revoked') - list_filter = ('arch', 'repo', 'user') + list_filter = ('arch', 'repo', 'user', 'created') search_fields = ('pkgbase', 'user__username') ordering = ('-created',) - date_hierarchy = 'created' class SignoffSpecificationAdmin(admin.ModelAdmin): list_display = ('pkgbase', 'full_version', 'arch', 'repo', 'user', 'created', 'comments') - list_filter = ('arch', 'repo', 'user') + list_filter = ('arch', 'repo', 'user', 'created') search_fields = ('pkgbase', 'user__username') ordering = ('-created',) - date_hierarchy = 'created' def get_queryset(self, request): qs = super(SignoffSpecificationAdmin, self).queryset(request) @@ -50,10 +47,9 @@ def get_queryset(self, request): class UpdateAdmin(admin.ModelAdmin): list_display = ('pkgname', 'repo', 'arch', 'action_flag', 'old_version', 'new_version', 'created') - list_filter = ('action_flag', 'repo', 'arch') + list_filter = ('action_flag', 'repo', 'arch', 'created') search_fields = ('pkgname',) ordering = ('-created',) - date_hierarchy = 'created' raw_id_fields = ('package',) -- cgit v1.2.3-54-g00ecf