summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-01-02 09:07:20 +0100
committerJelle van der Waa <jelle@vdwaa.nl>2018-04-08 12:51:19 +0200
commitf442bc42f7dd8fe95b54d9768bca65ac98796397 (patch)
tree8feb6d3a447cadf147a1b4e0195120a3ecf854c3
parent4ce9368cbf8e2100aa71d2263b3eca16283bc79d (diff)
downloadarchweb-f442bc42f7dd8fe95b54d9768bca65ac98796397.tar.gz
archweb-f442bc42f7dd8fe95b54d9768bca65ac98796397.zip
public/views: pgp_key is not a foreign relation, so cannot be select_related
Wonder how old this bug is.. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--public/views.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/public/views.py b/public/views.py
index 9afad7a2..74fea2ca 100644
--- a/public/views.py
+++ b/public/views.py
@@ -92,8 +92,7 @@ def feeds(request):
def keys(request):
profile_ids = UserProfile.allowed_repos.through.objects.values('userprofile_id')
users = User.objects.filter(
- is_active=True, userprofile__id__in=profile_ids).select_related(
- 'userprofile__pgp_key').order_by('first_name', 'last_name')
+ is_active=True, userprofile__id__in=profile_ids).order_by('first_name', 'last_name')
user_key_ids = frozenset(user.userprofile.pgp_key[-16:] for user in users
if user.userprofile.pgp_key)
@@ -138,8 +137,7 @@ def keys(request):
def keys_json(request):
profile_ids = UserProfile.allowed_repos.through.objects.values('userprofile_id')
users = User.objects.filter(
- is_active=True, userprofile__id__in=profile_ids).select_related(
- 'userprofile__pgp_key').order_by('first_name', 'last_name')
+ is_active=True, userprofile__id__in=profile_ids).order_by('first_name', 'last_name')
node_list = [{
'name': user.get_full_name(),
'key': user.userprofile.pgp_key,