diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-15 22:00:57 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-15 22:00:57 -0400 |
commit | 05430050147c87818c08373e9930756da4d6b5ac (patch) | |
tree | 24db1d6ca431ff64f91e3f41547b91687c4aedd7 /main/templatetags | |
parent | 86bd3d5e4920fd6d57ac51ed3abf02d2f368f2a7 (diff) | |
parent | 1a35cbe842212d674d83196ecfa70569ffe2e2da (diff) |
Merge tag 'release_2014-11-08' into archweb-generic
Mirror status and details switch to Jinja2
Diffstat (limited to 'main/templatetags')
-rw-r--r-- | main/templatetags/pgp.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index 2417f688..455e8f9c 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -44,21 +44,14 @@ def pgp_key_link(key_id, link_text=None): return '<a href="%s" title="PGP key search for %s">%s</a>' % values -@cache_function(1741) -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 None - - @register.simple_tag -def user_pgp_key_link(key_id): +def user_pgp_key_link(dev_keys, key_id): normalized = key_id[-16:] - name = name_for_key(normalized) - return pgp_key_link(key_id, name) + found = dev_keys.get(normalized, None) + if found: + return pgp_key_link(key_id, found.owner.get_full_name()) + else: + return pgp_key_link(key_id, None) @register.filter(needs_autoescape=True) |