diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/migrations/0033_mark_any_agnostic.py | 4 | ||||
| -rw-r--r-- | main/templatetags/pgp.py | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/main/migrations/0033_mark_any_agnostic.py b/main/migrations/0033_mark_any_agnostic.py index 6ba59b43..4f429a2b 100644 --- a/main/migrations/0033_mark_any_agnostic.py +++ b/main/migrations/0033_mark_any_agnostic.py @@ -7,10 +7,10 @@ from django.db import models class Migration(DataMigration): def forwards(self, orm): - orm.Arch.objects.filter(name='any').update(agnostic=True) + orm.Arch.objects.filter(name='any').update(agnostic=True) def backwards(self, orm): - pass + pass models = { 'auth.group': { diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index d69e2918..1ffc5241 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -16,17 +16,28 @@ def format_key(key_id): return u'0x%s' % key_id @register.simple_tag -def pgp_key_link(key_id): +def pgp_key_link(key_id, link_text=None): if not key_id: return "Unknown" + if isinstance(key_id, (int, long)): + key_id = '%X' % key_id + # zero-fill to nearest 8, 16, or 40 chars if necessary + if len(key_id) <= 8: + key_id = key_id.zfill(8) + elif len(key_id) <= 16: + key_id = key_id.zfill(16) + elif len(key_id) <= 40: + key_id = key_id.zfill(40) # Something like 'pgp.mit.edu:11371' pgp_server = getattr(settings, 'PGP_SERVER', None) if not pgp_server: return format_key(key_id) url = 'http://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \ (pgp_server, key_id) - values = (url, format_key(key_id), key_id[-8:]) - return '<a href="%s" title="PGP key search for %s">0x%s</a>' % values + if link_text is None: + link_text = '0x%s' % key_id[-8:] + values = (url, format_key(key_id), link_text) + return '<a href="%s" title="PGP key search for %s">%s</a>' % values @register.filter def pgp_fingerprint(key_id, autoescape=True): |