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 a7aa5069aec81a89c35a1b9e46574415e944e3e3..4e43045640164fd944f705af88bf54d332243d87 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 8498ab2f5fb4e4363975d633cceea6aaef191b41..b2909df8dbe2709bad590651fbd44ba2286c7dc3 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 e153088b3780a2139e9d69619db8b38fb7953995..9159819e9e07734d6cc73ac15265c09761ff9d7f 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 89e8c659e4340712640de197636c5fdd769fa485..0dc3649b7f8cda26c6b6484787e87d99c7e7cca4 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):