Don't show escalated apps in other queues (bug 763058)

mozilla · Jul 20, 2012 · ca1093f · ca1093f
1 parent 8c343d1
commit ca1093f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/mkt/reviewers/tests/test_views.py b/mkt/reviewers/tests/test_views.py
@@ -251,6 +251,12 @@ def test_queue_count(self):
     #    eq_(pq(r.content)('#addon-queue tbody tr').eq(0).attr('data-addon'),
     #        str(self.apps[1].id))
 
+    def test_escalated_not_in_queue(self):
+        EscalationQueue.objects.create(addon=self.apps[0])
+        res = self.client.get(self.url)
+        # self.apps[2] is not pending so doesn't show up either.
+        eq_(list(res.context['addons']), [self.apps[1]])
+
 
 class TestRereviewQueue(AppReviewerTest, AccessMixin):
     fixtures = ['base/devicetypes', 'base/users']
@@ -330,6 +336,11 @@ def test_queue_count(self):
         eq_(doc('.tabnav li a:eq(1)').text(), u'Re-reviews (3)')
         eq_(doc('.tabnav li a:eq(2)').text(), u'Escalations (0)')
 
+    def test_escalated_not_in_queue(self):
+        EscalationQueue.objects.create(addon=self.apps[0])
+        res = self.client.get(self.url)
+        eq_(res.context['addons'], self.apps[1:])
+
 
 class TestEscalationQueue(AppReviewerTest, AccessMixin):
     fixtures = ['base/devicetypes', 'base/users']

diff --git a/mkt/reviewers/views.py b/mkt/reviewers/views.py
@@ -195,15 +195,21 @@ def _queue(request, qs, tab, pager_processor=None):
 
 @permission_required('Apps', 'Review')
 def queue_apps(request):
-    qs = (Webapp.objects.pending().filter(disabled_by_user=False)
+    excluded_ids = EscalationQueue.objects.values_list('addon', flat=True)
+    qs = (Webapp.objects.pending()
+                        .exclude(id__in=excluded_ids)
+                        .filter(disabled_by_user=False)
                         .order_by('created'))
     return _queue(request, qs, 'pending')
 
 
 @permission_required('Apps', 'Review')
 def queue_rereview(request):
-    qs = (RereviewQueue.objects.filter(addon__disabled_by_user=False)
-                        .order_by('created'))
+    excluded_ids = EscalationQueue.objects.values_list('addon', flat=True)
+    qs = (RereviewQueue.objects
+                       .exclude(addon__in=excluded_ids)
+                       .filter(addon__disabled_by_user=False)
+                       .order_by('created'))
     return _queue(request, qs, 'rereview',
                   lambda p: [r.addon for r in p.object_list])