From f22d9b63ee979982b9ee59abcdecebdf23c63e9f Mon Sep 17 00:00:00 2001
From: Tom Walker <tomwalker0472@gmail.com>
Date: Thu, 24 Jul 2014 15:14:50 +0100
Subject: [PATCH] removed a check to see if matching user or quiz existed when
 filtering completed exams on the marking page - just shows an empty set if
 none found

---
 quiz/templates/quiz/sitting_list.html | 11 ++++++++++-
 quiz/tests.py                         |  6 ++++++
 quiz/views.py                         | 12 ++++--------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/quiz/templates/quiz/sitting_list.html b/quiz/templates/quiz/sitting_list.html
index 8c01436..6711e15 100644
--- a/quiz/templates/quiz/sitting_list.html
+++ b/quiz/templates/quiz/sitting_list.html
@@ -17,6 +17,15 @@
 		  </thead>
 
 		  <tbody>
+			<tr>
+			  <form action="" method="GET">
+				<td><input type="text" name="user_filter" /></td>
+				<td><input type="text" name="quiz_filter" /></td>
+				<td></td>
+				<td><button type="submit">Filter</button></td>
+			  </form>
+			</tr>
+
 
         {% for sitting in sitting_list %}
 
@@ -36,6 +45,6 @@
 
 		</table>
     {% else %}
-        <p>There are no complete quizzes.</p>
+        <p>There are no matching quizzes.</p>
     {% endif %}
 {% endblock %}
diff --git a/quiz/tests.py b/quiz/tests.py
index 9be58c5..f519d51 100644
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -400,6 +400,12 @@ class TestQuestionMarking(TestCase):
         chewy_sitting.save()
 
         self.client.login(username='yoda', password='use_d@_force')
+        response = self.client.get('/q/marking/',
+                                   {'user_filter': 'Hans'})
+
+        self.assertNotContains(response, 'chewy')
+        self.assertNotContains(response, 'luke')
+
         response = self.client.get('/q/marking/',
                                    {'user_filter': 'chewy'})
 
diff --git a/quiz/views.py b/quiz/views.py
index 76fc519..21caa68 100644
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -82,16 +82,12 @@ class QuizMarkingList(QuizMarkerMixin, ListView):
                                                .filter(complete=True)
 
         user_filter = self.request.GET.get('user_filter')
-        if user_filter and User.objects\
-                               .filter(username__icontains=user_filter)\
-                               .exists():
-            return queryset.filter(user__username__icontains=user_filter)
+        if user_filter:
+            queryset = queryset.filter(user__username__icontains=user_filter)
 
         quiz_filter = self.request.GET.get('quiz_filter')
-        if quiz_filter and Quiz.objects\
-                               .filter(title__icontains=quiz_filter)\
-                               .exists():
-            return queryset.filter(quiz__title__icontains=quiz_filter)
+        if quiz_filter:
+            queryset = queryset.filter(quiz__title__icontains=quiz_filter)
 
         return queryset
 
-- 
2.39.5