From 1d15497ef0d308c307d004bef2514e792e988bb2 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 22 Dec 2016 10:03:31 +0100
Subject: [PATCH] Correct bug: voting deactivated if College decision already
taken
---
submissions/models.py | 7 +++++++
submissions/views.py | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/submissions/models.py b/submissions/models.py
index 022408649..da203ab35 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 02e782b31..c90afce06 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,
--
GitLab