From 9075ae0d529ae53aab93178572fc9a6dba99e0e9 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 3 Jun 2019 09:57:40 +0200
Subject: [PATCH] Fix bug with assignment acceptance followed by direct EdRec
---
submissions/utils.py | 10 ++++++----
submissions/views.py | 2 +-
.../inform_authors_eic_assigned_direct_rec.html | 10 +++++-----
.../inform_authors_eic_assigned_direct_rec.json | 4 ++--
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/submissions/utils.py b/submissions/utils.py
index fa6ee261f..3c055ef1b 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -86,8 +86,9 @@ class SubmissionUtils(BaseMailUtil):
+ cls.assignment.submission.preprint.identifier_w_vn_nr
+ ' (also accessible from your personal page '
'https://scipost.org/personal_page under the Editorial Actions tab). '
- 'In particular, you should now invite at least 3 referees; you might want to'
- ' make sure you are aware of the '
+ 'In particular, unless you choose to directly formulate a Recommendation, '
+ 'you should now start a refereeing round and invite at least 3 referees; '
+ 'you might want to make sure you are aware of the '
'detailed procedure described in the Editorial College by-laws at '
'https://scipost.org/EdCol_by-laws.'
'\n\nMany thanks in advance for your collaboration,'
@@ -104,8 +105,9 @@ class SubmissionUtils(BaseMailUtil):
'(also accessible from your '
'<a href="https://scipost.org/personal_page">personal page</a> '
'under the Editorial Actions tab).</p>'
- '\n<p>In particular, you should now invite at least 3 referees; you might want to '
- 'make sure you are aware of the '
+ '\n<p>In particular, unless you choose to directly formulate a Recommendation, '
+ 'you should now start a refereeing round and invite at least 3 referees; '
+ 'you might want to make sure you are aware of the '
'detailed procedure described in the '
'<a href="https://scipost.org/EdCol_by-laws">Editorial College by-laws</a>.</p>'
'<p>Many thanks in advance for your collaboration,</p>'
diff --git a/submissions/views.py b/submissions/views.py
index 9d959a642..7adcdc8a6 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -755,7 +755,7 @@ def editorial_assignment(request, identifier_w_vn_nr, assignment_id=None):
else:
# Inform authors about new status.
mail_sender = DirectMailUtil(
- 'authors/inform_authors_eic_assigned_direct_rec', submission=submission)
+ 'authors/inform_authors_eic_assigned_direct_rec', assignment=assignment)
mail_sender.send_mail()
submission.add_general_event('The Editor-in-charge has been assigned.')
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
index bc74bafdc..378780963 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
@@ -1,12 +1,12 @@
<p>
- Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+ Dear {{ assignment.submission.submitted_by.get_title_display }} {{ assignment.submission.submitted_by.user.last_name }},
</p>
<p>
For your information, your Submission
<br><br>
- {{ submission.title }}
- <br>by {{ submission.author_list }}<br>
- (see https://scipost.org{{ submission.get_absolute_url }}.
+ {{ assignment.submission.title }}
+ <br>by {{ assignment.submission.author_list }}<br>
+ (see https://scipost.org{{ assignment.submission.get_absolute_url }}.
</p>
<p>has been assigned to an editor. The editor chose to directly formulate an Editorial Recommendation.</p>
@@ -19,4 +19,4 @@
</p>
{% include 'email/_footer.html' %}
-{% include 'email/_submission_thread_uuid.html' with submission=submission %}
+{% include 'email/_submission_thread_uuid.html' with submission=assignment.submission %}
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.json b/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
index 65a877254..80399d1b5 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
@@ -1,10 +1,10 @@
{
"subject": "SciPost: Editor assigned",
"recipient_list": [
- "submitted_by.user.email"
+ "submission.submitted_by.user.email"
],
"bcc": [
- "editor_in_charge.user.email",
+ "to.user.email",
"edadmin@scipost.org"
],
"from_name": "SciPost Refereeing",
--
GitLab