summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorGiancarlo Razzolini <grazzolini@archlinux.org>2017-06-14 21:37:44 -0300
committerGiancarlo Razzolini <grazzolini@archlinux.org>2017-06-14 21:37:44 -0300
commit7dfc2d3eccc894a7728ba360c72e13a94027a9ce (patch)
treee6d4186736a003ffc2b4b5791ad9040ef24c804c /devel
parent668a8c7ce5ffd93ee7acd7578d496430660f4183 (diff)
downloadarchweb-7dfc2d3eccc894a7728ba360c72e13a94027a9ce.tar.gz
archweb-7dfc2d3eccc894a7728ba360c72e13a94027a9ce.zip
Use a list and a groups filter to aid readability and avoid using Q
Diffstat (limited to 'devel')
-rw-r--r--devel/views.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/devel/views.py b/devel/views.py
index be9d8979..07571b96 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -10,7 +10,7 @@ from django.contrib.auth.decorators import (login_required,
from django.contrib.auth.models import Group, User
from django.contrib.contenttypes.models import ContentType
from django.db import transaction
-from django.db.models import Count, Max, Q
+from django.db.models import Count, Max
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render
from django.utils.encoding import force_unicode
@@ -104,11 +104,12 @@ def stats(request):
return render(request, 'devel/stats.html', page_dict)
+SELECTED_GROUPS = ['Developers', 'Trusted Users', 'Support Staff']
@login_required
def clock(request):
- devs = User.objects.filter(is_active=True).filter(groups__in=Group.objects.filter(
- Q(name='Developers') | Q(name='Trusted Users') | Q(name='Support Staff'))).order_by(
+ groups = Group.objects.filter(name__in=SELECTED_GROUPS)
+ devs = User.objects.filter(is_active=True).filter(groups__in=groups).order_by(
'first_name', 'last_name').select_related('userprofile').distinct()
latest_news = dict(News.objects.filter(author__is_active=True).values_list(