diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-22 21:57:02 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-22 21:57:02 -0500 |
commit | f545de301a3188eefffb79de018d5fda2f03946d (patch) | |
tree | c30c10c3cef88d84a6e38a43b63ddf5c4f83d2f5 /main/templatetags/pgp.py | |
parent | 2e634dc457a35d06ec83409da3d6006107495569 (diff) | |
parent | 2bfec5b17ca3ee3ea3b347c029b9d8dad3c5b4d0 (diff) |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
README.md
Diffstat (limited to 'main/templatetags/pgp.py')
-rw-r--r-- | main/templatetags/pgp.py | 18 |
1 files changed, 13 insertions, 5 deletions
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 '<a href="%s" title="PGP key search for %s">%s</a>' % 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) |