summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiancarlo Razzolini <grazzolini@archlinux.org>2017-06-13 15:15:31 -0300
committerGiancarlo Razzolini <grazzolini@archlinux.org>2017-06-13 15:15:31 -0300
commit668a8c7ce5ffd93ee7acd7578d496430660f4183 (patch)
treeaae6f3aee1ed39d126c2a92578794e9afac5d5ba
parent46a6e9d2bd4c2639f0c3a802d380fdeeebdc5c86 (diff)
downloadarchweb-668a8c7ce5ffd93ee7acd7578d496430660f4183.tar.gz
archweb-668a8c7ce5ffd93ee7acd7578d496430660f4183.zip
Filter the users that appear on the devel clocks page
Since we have testers and other kind of users, filter the users that appear on the devel clocks page for membership on Developers, Trusted Users or Support Staff only.
-rw-r--r--devel/views.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/devel/views.py b/devel/views.py
index e86c60c1..be9d8979 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -7,10 +7,10 @@ from django.contrib.admin.models import ADDITION, LogEntry
from django.contrib.auth.decorators import (login_required,
permission_required,
user_passes_test)
-from django.contrib.auth.models import User
+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
+from django.db.models import Count, Max, Q
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render
from django.utils.encoding import force_unicode
@@ -107,8 +107,9 @@ def stats(request):
@login_required
def clock(request):
- devs = User.objects.filter(is_active=True).order_by(
- 'first_name', 'last_name').select_related('userprofile')
+ 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(
+ 'first_name', 'last_name').select_related('userprofile').distinct()
latest_news = dict(News.objects.filter(author__is_active=True).values_list(
'author').order_by().annotate(last_post=Max('postdate')))