From efd1bd15ef34b9ebafd703375108fb41b1a6ecf0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 25 Nov 2013 21:31:21 -0600 Subject: Capitalize URL properly in Django admin Signed-off-by: Dan McGee --- main/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/models.py b/main/models.py index 8d9d4c89..bf7a9409 100644 --- a/main/models.py +++ b/main/models.py @@ -97,7 +97,7 @@ class Package(models.Model): pkgrel = models.CharField(max_length=255) epoch = models.PositiveIntegerField(default=0) pkgdesc = models.TextField('description', null=True) - url = models.CharField(max_length=255, null=True) + url = models.CharField('URL', max_length=255, null=True) filename = models.CharField(max_length=255) compressed_size = PositiveBigIntegerField() installed_size = PositiveBigIntegerField() -- cgit v1.2.3 From 954b61ee3a0760990f8e17d7d692f3cabd949f9f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Nov 2013 17:08:42 -0500 Subject: Syntax cleanups to main admin Signed-off-by: Dan McGee --- main/admin.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'main') diff --git a/main/admin.py b/main/admin.py index 6aff12e5..ec2b5bc8 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,23 +1,27 @@ from django.contrib import admin from main.models import Arch, Donor, Package, Repo + class DonorAdmin(admin.ModelAdmin): list_display = ('name', 'visible', 'created') list_filter = ('visible', 'created') search_fields = ('name',) exclude = ('created',) + class ArchAdmin(admin.ModelAdmin): list_display = ('name', 'agnostic', 'required_signoffs') list_filter = ('agnostic',) search_fields = ('name',) + class RepoAdmin(admin.ModelAdmin): list_display = ('name', 'testing', 'staging', 'bugs_project', 'bugs_category', 'svn_root') list_filter = ('testing', 'staging') search_fields = ('name',) + class PackageAdmin(admin.ModelAdmin): list_display = ('pkgname', 'full_version', 'repo', 'arch', 'packager', 'last_update', 'build_date') -- cgit v1.2.3 From 3b1b677b49af194313da766579e9fa1a021afd84 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 1 Dec 2013 23:15:30 -0600 Subject: Speed up master key listing page We were spending a lot of time getting the developer name for a given key on this page, which involved sending one query per key ID. Use the cache to our advantage here and save ourselves the "expensive" lookups. This eliminates ~100 queries per page load. Signed-off-by: Dan McGee --- main/templatetags/pgp.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index e93e5bca..cc080439 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -3,6 +3,7 @@ from django.conf import settings from django.utils.html import conditional_escape from django.utils.safestring import mark_safe +from ..utils import cache_function from devel.models import DeveloperKey register = template.Library() @@ -42,15 +43,22 @@ def pgp_key_link(key_id, link_text=None): values = (url, format_key(key_id), link_text) return '%s' % values -@register.simple_tag -def user_pgp_key_link(key_id): - normalized = key_id[-16:] + +@cache_function(1800) +def name_for_key(normalized): try: matching_key = DeveloperKey.objects.select_related( 'owner').get(key=normalized, owner_id__isnull=False) + return matching_key.owner.get_full_name() except DeveloperKey.DoesNotExist: - return pgp_key_link(key_id) - return pgp_key_link(key_id, matching_key.owner.get_full_name()) + return None + + +@register.simple_tag +def user_pgp_key_link(key_id): + normalized = key_id[-16:] + name = name_for_key(normalized) + return pgp_key_link(key_id, name) @register.filter(needs_autoescape=True) -- cgit v1.2.3 From 6d352bc62361edd4ce15189e31fccff5f0eb5e9a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 22 Dec 2013 21:47:41 -0500 Subject: Pull the bug link generation into a templatetag --- main/templatetags/bugs.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 main/templatetags/bugs.py (limited to 'main') diff --git a/main/templatetags/bugs.py b/main/templatetags/bugs.py new file mode 100644 index 00000000..d5764435 --- /dev/null +++ b/main/templatetags/bugs.py @@ -0,0 +1,6 @@ +from django import template +register = template.Library() + +@register.simple_tag +def bug_link(bugid): + return "FS#"+bugid+"" -- cgit v1.2.3