#4081 reviewers from past review rounds are now valid review assignment choices.

src/review/logic.py

@@ -86,8 +86,11 @@ def get_reviewer_candidates(article, user=None, reviewers_to_exclude=None):
     :param user: The user requesting candidates who would be filtered out
     :param reviewers_to_exclude: queryset of Account objects
     """
-    review_assignments = article.reviewassignment_set.filter(review_round=article.current_review_round_object())
-    reviewer_pks_to_exclude = [review.reviewer.pk for review in review_assignments]
+    reviewer_pks_to_exclude = [
+        review.reviewer.pk for review in article.reviewassignment_set.filter(
+            review_round=article.current_review_round_object(),
+        )
+    ]
     if user:
         reviewer_pks_to_exclude.append(user.pk)
 

src/review/views.py

@@ -1096,7 +1096,6 @@ def add_review_assignment(request, article_id):
     reviewers = logic.get_reviewer_candidates(
         article,
         user=request.user,
-        reviewers_to_exclude=past_reviewers,
     )
 
     form = forms.ReviewAssignmentForm(
@@ -1179,7 +1178,11 @@ def add_review_assignment(request, article_id):
     context = {
         'article': article,
         'form': form,
-        'reviewers': reviewers,
+        # Exclude any past reviewers to ensure they do not show in the
+        # reviewer list twice but are valid choices.
+        'reviewers': reviewers.exclude(
+            pk__in=[reviewer.pk for reviewer in past_reviewers],
+        ),
         'new_reviewer_form': new_reviewer_form,
         'past_reviewers': past_reviewers,
     }