diff --git a/submissions/models.py b/submissions/models.py index 0224086496f1b84b98be6f296ed37734687f4cda..da203ab3563f774c6ef6e7326d38d8d6a2d8d51b 100644 --- a/submissions/models.py +++ b/submissions/models.py @@ -73,6 +73,13 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [ 'withdrawn', ] +# Submissions for which voting on a related recommendation is deprecated: +SUBMISSION_STATUS_VOTING_DEPRECATED = [ + 'rejected', + 'published', + 'withdrawn', +] + # SUBMISSION_ACTION_REQUIRED = ( # ('assign_EIC', 'Editor-in-charge to be assigned'), diff --git a/submissions/views.py b/submissions/views.py index 02e782b3130d41c3cf3a6a9dd6e91f59a5fef5aa..c90afce0633dab1111b3a8730c98ae86e0c45617 100644 --- a/submissions/views.py +++ b/submissions/views.py @@ -475,7 +475,8 @@ def pool(request): recommendation=-1).exclude(recommendation=-2).exclude( voted_for__in=[contributor]).exclude( voted_against__in=[contributor]).exclude( - voted_abstain__in=[contributor]) + voted_abstain__in=[contributor]).exclude( + submission__status__in=SUBMISSION_STATUS_VOTING_DEPRECATED) rec_vote_form = RecommendationVoteForm() context = {'submissions_in_pool': submissions_in_pool, 'recommendations_undergoing_voting': recommendations_undergoing_voting,