From da61fed4be6a28c870580f448c7c486f46d7b088 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 30 Nov 2011 13:31:51 -0600 Subject: Add master key model and admin integration --- devel/models.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'devel/models.py') diff --git a/devel/models.py b/devel/models.py index e69de29b..ea0f4d55 100644 --- a/devel/models.py +++ b/devel/models.py @@ -0,0 +1,17 @@ +from django.db import models +from django.contrib.auth.models import User + +from main.fields import PGPKeyField + + +class MasterKey(models.Model): + owner = models.ForeignKey(User, related_name='masterkey_owner', + help_text="The developer holding this master key") + revoker = models.ForeignKey(User, related_name='masterkey_revoker', + help_text="The developer holding the revocation certificate") + pgp_key = PGPKeyField(max_length=40, verbose_name="PGP key fingerprint", + help_text="consists of 40 hex digits; use `gpg --fingerprint`") + created = models.DateTimeField() + revoked = models.DateTimeField(null=True, blank=True) + +# vim: set ts=4 sw=4 et: -- cgit v1.2.3-54-g00ecf From 025042ef0d23378a5f10fe1cff8f660f51638615 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 30 Nov 2011 14:45:05 -0600 Subject: Master keys: reduce query count, add default ordering Signed-off-by: Dan McGee --- devel/models.py | 3 +++ public/views.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'devel/models.py') diff --git a/devel/models.py b/devel/models.py index ea0f4d55..f31b8fbb 100644 --- a/devel/models.py +++ b/devel/models.py @@ -14,4 +14,7 @@ class MasterKey(models.Model): created = models.DateTimeField() revoked = models.DateTimeField(null=True, blank=True) + class Meta: + ordering = ('created',) + # vim: set ts=4 sw=4 et: diff --git a/public/views.py b/public/views.py index 95b590fc..40512614 100644 --- a/public/views.py +++ b/public/views.py @@ -79,7 +79,8 @@ def feeds(request): def keys(request): context = { - 'keys': MasterKey.objects.select_related('owner', 'revoker').all(), + 'keys': MasterKey.objects.select_related('owner', 'revoker', + 'owner__userprofile', 'revoker__userprofile').all(), } return direct_to_template(request, 'public/keys.html', context) -- cgit v1.2.3-54-g00ecf