Reviewer 'Next' button gets the next feedback of the same type

core/views/feedback.py

@@ -72,7 +72,7 @@ class FeedbackEdit(UpdateView):
         # ugly needs patch
         if 'Next' in self.request.POST['update']:
             if in_groups(self.request.user, ('Reviewers',)):
-                needs_review = Feedback.objects.filter(status=Feedback.NEEDS_REVIEW)
+                needs_review = Feedback.objects.filter(status=Feedback.NEEDS_REVIEW, of_submission__type=form.instance.of_submission.type)
                 needs_review = needs_review[0] if needs_review else None
                 if needs_review:
                     return HttpResponseRedirect(reverse('FeedbackEdit', args=(needs_review.slug,)))