From 932383c33aa99a6ae6e61a2049ecdacc5ecf6cc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 12 Nov 2013 10:57:48 +0100 Subject: [PATCH 1/1] Show todo count for non superuser --- wtem/admin.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/wtem/admin.py b/wtem/admin.py index be96131..72c2042 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -148,15 +148,16 @@ class SubmissionAdmin(admin.ModelAdmin): def changelist_view(self, request, extra_context=None): context = dict(examiners = []) - if request.user.is_superuser: - submissions = Submission.objects.all() - for assignment in Assignment.objects.all(): - examiner = dict(name = assignment.user.username, todo = 0) - for submission in Submission.objects.filter(examiners = assignment.user): - for exercise_id in assignment.exercises: - if submission.get_mark(user_id = assignment.user.id, exercise_id = exercise_id) is None: - examiner['todo'] += 1 - context['examiners'].append(examiner) + assignments = Assignment.objects.all() + if not request.user.is_superuser: + assignments = assignments.filter(user = request.user) + for assignment in assignments: + examiner = dict(name = assignment.user.username, todo = 0) + for submission in Submission.objects.filter(examiners = assignment.user): + for exercise_id in assignment.exercises: + if submission.get_mark(user_id = assignment.user.id, exercise_id = exercise_id) is None: + examiner['todo'] += 1 + context['examiners'].append(examiner) return super(SubmissionAdmin, self).changelist_view(request, extra_context = context) def queryset(self, request): -- 2.20.1