From 95b3c0d6b407a79ab4fc67fac833fa96a1b849a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20Caux?= <git@jscaux.org>
Date: Fri, 15 Oct 2021 06:19:08 +0200
Subject: [PATCH] Remove deprecated submissions:prescreening_failed view
---
.../admin/submission_preassign_editors.html | 1 -
.../submissions/pool/_submission_details.html | 1 -
scipost_django/submissions/urls.py | 2 --
scipost_django/submissions/views.py | 32 -------------------
4 files changed, 36 deletions(-)
diff --git a/scipost_django/submissions/templates/submissions/admin/submission_preassign_editors.html b/scipost_django/submissions/templates/submissions/admin/submission_preassign_editors.html
index a7aa5069a..4e4304564 100644
--- a/scipost_django/submissions/templates/submissions/admin/submission_preassign_editors.html
+++ b/scipost_django/submissions/templates/submissions/admin/submission_preassign_editors.html
@@ -34,7 +34,6 @@
{% if submission.status == 'incoming' %}
<li><a href="{% url 'submissions:do_prescreening' submission.preprint.identifier_w_vn_nr %}">Go to pre-screening page</a></li>
{% else %}
- <li><a href="{% url 'submissions:prescreening_failed' submission.preprint.identifier_w_vn_nr %}">Close: pre-screening failed</a></li>
<li><a href="{% url 'submissions:update_authors_screening' submission.preprint.identifier_w_vn_nr 1 %}">Update authors by email (1 week into screening)</a></li>
<li><a href="{% url 'submissions:update_authors_screening' submission.preprint.identifier_w_vn_nr 2 %}">Update authors by email (2 weeks into screening)</a></li>
<li><a href="{% url 'submissions:assignment_failed' submission.preprint.identifier_w_vn_nr %}">Close: screening failed (failure to find EIC)</a></li>
diff --git a/scipost_django/submissions/templates/submissions/pool/_submission_details.html b/scipost_django/submissions/templates/submissions/pool/_submission_details.html
index 8498ab2f5..b2909df8d 100644
--- a/scipost_django/submissions/templates/submissions/pool/_submission_details.html
+++ b/scipost_django/submissions/templates/submissions/pool/_submission_details.html
@@ -74,7 +74,6 @@
{% endfor %}
{% if not submission.editor_in_charge %}
- <li><a href="{% url 'submissions:prescreening_failed' submission.preprint.identifier_w_vn_nr %}">Close: pre-screening failed</a></li>
<li><a href="{% url 'submissions:update_authors_screening' submission.preprint.identifier_w_vn_nr 1 %}">Update authors by email (1 week into screening)</a></li>
<li><a href="{% url 'submissions:update_authors_screening' submission.preprint.identifier_w_vn_nr 2 %}">Update authors by email (2 weeks into screening)</a></li>
<li><a href="{% url 'submissions:assignment_failed' submission.preprint.identifier_w_vn_nr %}">Close: screening failed (failure to find EIC)</a></li>
diff --git a/scipost_django/submissions/urls.py b/scipost_django/submissions/urls.py
index e153088b3..9159819e9 100644
--- a/scipost_django/submissions/urls.py
+++ b/scipost_django/submissions/urls.py
@@ -188,8 +188,6 @@ url(r'^admin/{regex}/plagiarism/internal$'.format(regex=SUBMISSIONS_COMPLETE_REG
url(r'^pool/{regex}/editorial_assignment/(?P<assignment_id>[0-9]+)/$'.format(
regex=SUBMISSIONS_COMPLETE_REGEX), views.editorial_assignment,
name='editorial_assignment'),
- url(r'^prescreening_failed/{regex}$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
- views.prescreening_failed, name='prescreening_failed'),
url(r'^update_authors_screening/{regex}/(?P<nrweeks>[1-2])$'.format(
regex=SUBMISSIONS_COMPLETE_REGEX),
views.update_authors_screening, name='update_authors_screening'),
diff --git a/scipost_django/submissions/views.py b/scipost_django/submissions/views.py
index 89e8c659e..0dc3649b7 100644
--- a/scipost_django/submissions/views.py
+++ b/scipost_django/submissions/views.py
@@ -948,38 +948,6 @@ def assignment_request(request, assignment_id):
}))
-@login_required
-@permission_required('scipost.can_assign_submissions', raise_exception=True)
-@transaction.atomic
-def prescreening_failed(request, identifier_w_vn_nr):
- """
- Reject a Submission because pre-screening has failed.
- """
- submission = get_object_or_404(Submission.objects.pool(request.user).unassigned(),
- preprint__identifier_w_vn_nr=identifier_w_vn_nr)
-
- mail_editor_view = MailEditorSubview(
- request, mail_code='prescreening_failed', instance=submission,
- header_template='submissions/admin/prescreening_failed.html')
- if mail_editor_view.is_valid():
- # Deprecate old Editorial Assignments
- EditorialAssignment.objects.filter(submission=submission).invited().update(
- status=STATUS_DEPRECATED)
-
- # Update status of Submission
- submission.touch()
- Submission.objects.filter(id=submission.id).update(
- status=STATUS_FAILED_PRESCREENING, visible_pool=False, visible_public=False)
-
- messages.success(
- request, 'Submission {identifier} has failed pre-screening and been rejected.'.format(
- identifier=submission.preprint.identifier_w_vn_nr))
- messages.success(request, 'Authors have been informed by email.')
- mail_editor_view.send_mail()
- return redirect(reverse('submissions:pool'))
- return mail_editor_view.interrupt()
-
-
@login_required
@permission_required('scipost.can_assign_submissions', raise_exception=True)
def update_authors_screening(request, identifier_w_vn_nr, nrweeks):
--
GitLab