From b54f21a4fdd1557b63ec48c4b2438b9e7feb2bcc Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 6 Nov 2018 10:04:29 +0100
Subject: [PATCH] Fix completing-edassignemnts
---
submissions/forms.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/submissions/forms.py b/submissions/forms.py
index b9cdc971b..25803c93d 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1196,6 +1196,11 @@ class EICRecommendationForm(forms.ModelForm):
recommendation.status = DECISION_FIXED
Submission.objects.filter(id=self.submission.id).update(open_for_reporting=False)
+ if self.assignment:
+ # The EIC has fulfilled this editorial assignment.
+ self.assignment.status = STATUS_COMPLETED
+ self.assignment.save()
+
# Add SubmissionEvents for both Author and EIC
self.submission.add_general_event(event_text.format(
recommendation.get_recommendation_display()))
@@ -1214,10 +1219,6 @@ class EICRecommendationForm(forms.ModelForm):
recommendation.save()
- if self.assignment:
- # The EIC has fulfilled this editorial assignment.
- self.assignment.status = STATUS_COMPLETED
- self.assignment.save()
return recommendation
def revision_requested(self):
@@ -1456,6 +1457,10 @@ class FixCollegeDecisionForm(forms.ModelForm):
status=STATUS_REJECTED, latest_activity=timezone.now())
submission.get_other_versions().update(visible_public=False)
+ # Update Editorial Assignment statuses.
+ EditorialAssignment.objects.filter(
+ submission=submission, to=submission.editor_in_charge).update(status=STATUS_COMPLETED)
+
# Add SubmissionEvent for authors
submission.add_event_for_author(
'The Editorial Recommendation has been formulated: {0}.'.format(
--
GitLab