removed a check to see if matching user or quiz existed when filtering completed...

diff --git a/quiz/templates/quiz/sitting_list.html b/quiz/templates/quiz/sitting_list.html
index 8c01436d87e5897b691e9ccc290f062034145557..6711e158ea2b92170641c23983861783f18e45c4 100644 (file)
--- 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 9be58c530a4cd9d3774fadd781bc930582cf9579..f519d51627852944021ed7004c9836323fd2260a 100644 (file)
--- 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 76fc519b161e14772e4041a898329ee4fd1881f5..21caa689e5ead864a9e8f170906303e66d07c024 100644 (file)
--- 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