summaryrefslogtreecommitdiff
path: root/public/views.py
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-16 01:19:04 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-16 01:19:04 -0400
commit7da44456fd05f2ac74355825de7100e46e86449b (patch)
tree036c0732cbfcbbbd0cf9f7b3dd06d3c2ea7e9b09 /public/views.py
parent155bf43a28e404f327a7bcff214c22e212627673 (diff)
parent1edc33fd73ba588dea8765cd2d9a936f98d7dc1e (diff)
Merge tag 'release_2015-01-13' into archweb-generic
Version bumps and minor fixes
Diffstat (limited to 'public/views.py')
-rw-r--r--public/views.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/public/views.py b/public/views.py
index c0dae400..7dd0528c 100644
--- a/public/views.py
+++ b/public/views.py
@@ -142,8 +142,6 @@ def keys_json(request):
users = User.objects.filter(
is_active=True, userprofile__id__in=profile_ids).select_related(
'userprofile__pgp_key').order_by('first_name', 'last_name')
-
- users = User.objects.filter(is_active=True).select_related('userprofile')
node_list = [{
'name': user.get_full_name(),
'key': user.userprofile.pgp_key,