summaryrefslogtreecommitdiff
path: root/public/views.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:49:17 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:49:17 -0500
commit0877f0389f187cf2cbf026c73b27071857d3e6f7 (patch)
tree6408feac822cff49dfb92bcdf227ee80ebb87212 /public/views.py
parent5b1ccb92255d3e2504c9814d66769de35dd0415d (diff)
parent5d22a3b891be36b74871b88cb1b125723996415e (diff)
Merge tag 'release_2013-10-27' into archweb-generic
Dependency updates and fix for key revokes
Diffstat (limited to 'public/views.py')
-rw-r--r--public/views.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/views.py b/public/views.py
index 7a1e2788..a5f818dc 100644
--- a/public/views.py
+++ b/public/views.py
@@ -126,7 +126,7 @@ def keys(request):
'owner__userprofile', 'revoker__userprofile').filter(
revoked__isnull=True)
- sig_counts = PGPSignature.objects.filter(not_expired, valid=True,
+ sig_counts = PGPSignature.objects.filter(not_expired, revoked__isnull=True,
signee__in=user_key_ids).order_by().values_list('signer').annotate(
Count('signer'))
sig_counts = {key_id[-16:]: ct for key_id, ct in sig_counts}
@@ -136,11 +136,11 @@ def keys(request):
# frozenset because we are going to do lots of __contains__ lookups
signatures = frozenset(PGPSignature.objects.filter(
- not_expired, valid=True).values_list('signer', 'signee'))
+ not_expired, revoked__isnull=True).values_list('signer', 'signee'))
restrict = Q(signer__in=user_key_ids) & Q(signee__in=user_key_ids)
cross_signatures = PGPSignature.objects.filter(restrict,
- not_expired, valid=True).order_by('created')
+ not_expired, revoked__isnull=True).order_by('created')
context = {
'keys': master_keys,
@@ -183,7 +183,7 @@ def keys_json(request):
})
not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
- signatures = PGPSignature.objects.filter(not_expired, valid=True)
+ signatures = PGPSignature.objects.filter(not_expired, revoked__isnull=True)
edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
for sig in signatures]