diff --git a/submissions/constants.py b/submissions/constants.py index c06c7aa50671192b367b90113867d785e6ee5e40..438211e49ea4f20625d128ca00d6d60dd628fbf0 100644 --- a/submissions/constants.py +++ b/submissions/constants.py @@ -105,7 +105,6 @@ SUBMISSION_TYPE = ( NO_REQUIRED_ACTION_STATUSES = SUBMISSION_STATUS_PUBLICLY_INVISIBLE + [ STATUS_UNASSIGNED, - STATUS_RESUBMISSION_INCOMING ] ED_COMM_CHOICES = ( diff --git a/submissions/utils.py b/submissions/utils.py index 018678df47c577abed88a996765b06acef1b001d..103c5d84954bca216471be1b578b9ef1df0c9c35 100644 --- a/submissions/utils.py +++ b/submissions/utils.py @@ -169,7 +169,7 @@ class BaseRefereeSubmissionCycle(BaseSubmissionCycle): for ref_inv in self.submission.referee_invitations.all(): if not ref_inv.cancelled: if ref_inv.accepted is None: - '''An invited referee may have not responsed yet.''' + '''An invited referee may have not responded yet.''' timelapse = timezone.now() - ref_inv.date_invited if timelapse > datetime.timedelta(days=3): text = ('Referee %s has not responded for %i days. ' @@ -185,10 +185,10 @@ class BaseRefereeSubmissionCycle(BaseSubmissionCycle): if timeleft.days < 0: text += '(%i days overdue). ' % (- timeleft.days) elif timeleft.days == 1: - text += '(with 1 day left). ' + text += '(with 1 day left). Consider sending an urgent reminder.' else: - text += '(with %i days left). ' % timeleft.days - text += 'Consider sending a reminder or cancelling the invitation.' + text += ('(with %i days left). Consider sending a reminder if ' + 'you think it can ensure a timely Report.' % timeleft.days) self.required_actions.append(('referee_no_delivery', text,)) if self.submission.reporting_deadline < timezone.now(): diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html index 4de2a66f09db57ed6bec3728afc50fae1c9690b3..a7c8eb44ea0bb427108596b6df2c1bda41df7551 100644 --- a/templates/email/email_fellow_tasklist.html +++ b/templates/email/email_fellow_tasklist.html @@ -1,7 +1,7 @@ {% load bootstrap %} {% load submissions_extras %} <p>Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},</p> -<p>Please find below a digest of your current assignments, with pending and upcoming required actions. Many thanks in advance for your timely invervention.</p> +<p>Please find below a digest of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely invervention.</p> {% if assignments_to_consider %} <h3>Assignments for you to consider:</h3> <ul> @@ -18,7 +18,7 @@ {% for assignment in assignments_ongoing %} <li> <p> - <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> + <a href="https://scipost.org{% url 'submissions:submission_detail' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> <em>by {{ assignment.submission.author_list }}</em> </p> <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p> diff --git a/templates/email/email_fellow_tasklist.txt b/templates/email/email_fellow_tasklist.txt index 5e6fb41558e9794e510f3d01726803bf687c03ba..a1d87206611ddb5dc11b07f15cafccf879468313 100644 --- a/templates/email/email_fellow_tasklist.txt +++ b/templates/email/email_fellow_tasklist.txt @@ -1,6 +1,6 @@ {% load submissions_extras %} Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},\n\n -Please find below a digest of your current assignments, with pending and upcoming required actions. Many thanks in advance for your timely invervention.\n\n +Please find below a digest of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely invervention.\n\n {% if assignments_to_consider %} Assignments for you to consider:\n\n {% for assignment in assignments_to_consider %}