diff options
author | Angel Velásquez <angvp@archlinux.org> | 2017-06-15 15:10:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 15:10:28 -0400 |
commit | a55b927bcb223fe190e69aba9e942cb5d2a34cec (patch) | |
tree | 4ac09938d7df733ecff178f76f7faae1a83f75b9 | |
parent | c679d935c8651df9d3a075f12b35663737d47974 (diff) | |
parent | 7dfc2d3eccc894a7728ba360c72e13a94027a9ce (diff) |
Merge pull request #36 from grazzolini/devel_clocksrelease_2017-06-15
Filter the users that appear on the devel clocks page
-rw-r--r-- | devel/views.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/devel/views.py b/devel/views.py index e86c60c1..07571b96 100644 --- a/devel/views.py +++ b/devel/views.py @@ -7,7 +7,7 @@ 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 @@ -104,11 +104,13 @@ 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).order_by( - 'first_name', 'last_name').select_related('userprofile') + 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( 'author').order_by().annotate(last_post=Max('postdate'))) |