From cdb6375ddadece3dbaa87a96b58be62aed6e0ba1 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 23 Jan 2017 14:58:24 +0100
Subject: [PATCH] No required_action if EICRecommendation has been formulated.
---
submissions/templatetags/submissions_extras.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/submissions/templatetags/submissions_extras.py b/submissions/templatetags/submissions_extras.py
index 94dc92202..0ae2ea8d1 100644
--- a/submissions/templatetags/submissions_extras.py
+++ b/submissions/templatetags/submissions_extras.py
@@ -31,9 +31,9 @@ def required_actions(submission):
This method returns a list of required actions on a Submission.
Each list element is a textual statement.
"""
- if submission.status in SUBMISSION_STATUS_OUT_OF_POOL:
- return []
- if submission.status == 'revision_requested':
+ if (submission.status in SUBMISSION_STATUS_OUT_OF_POOL
+ or submission.status == 'revision_requested'
+ or submission.eicrecommendation_set.exists()):
return []
todo = []
for comment in submission.comment_set.all():
@@ -70,7 +70,8 @@ def required_actions(submission):
% (refname, str(timeleft.days)))
if submission.reporting_deadline < timezone.now():
todo.append('The refereeing deadline has passed. Please either extend it, '
- 'or formulate your Editorial Recommendation.')
+ 'or formulate your Editorial Recommendation if at least '
+ 'one Report has been received.')
reports = submission.report_set.all()
for report in reports:
if report.status == 0:
--
GitLab