diff --git a/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html b/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html index a2e5a871c616bd8e08c2d38e607016977d12d781..54f3b6cfedfee8dcad6bb93dbe0fd4de3ba5761f 100644 --- a/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html +++ b/scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html @@ -29,8 +29,8 @@ </div> </div> </summary> - <div id="submission-{{ submission.pk }}-details-contents" - hx-get="{% url 'edadmin:_hx_submission_details_contents' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}" + <div id="submission-{{ submission.pk }}-edadmin" + hx-get="{% url 'edadmin:_hx_submission_edadmin' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}" hx-trigger="toggle once from:#submission-{{ submission.pk }}-details, submission-{{ submission.pk }}-details-updated" > </div> diff --git a/scipost_django/edadmin/urls/__init__.py b/scipost_django/edadmin/urls/__init__.py index f5109a296c551beca0518c2d193c4e14b5e87974..8b96a1393a75640c058fce039257196f1b43810c 100644 --- a/scipost_django/edadmin/urls/__init__.py +++ b/scipost_django/edadmin/urls/__init__.py @@ -19,5 +19,15 @@ urlpatterns = [ base._hx_submissions_in_stage, name="_hx_submissions_in_stage", ), + path( + "<identifier:identifier_w_vn_nr>/", + include([ + path( + "_hx_submission_edadmin", + incoming._hx_submission_edadmin, + name="_hx_submission_edadmin", + ), + ]), + ), path("incoming/", include("edadmin.urls.incoming")), ] diff --git a/scipost_django/edadmin/urls/incoming.py b/scipost_django/edadmin/urls/incoming.py index 7128119f712de09896ebf026ca9bed924a4f475c..7aa3a90ca46b505b6acf3c56ba179cb1e5fc5654 100644 --- a/scipost_django/edadmin/urls/incoming.py +++ b/scipost_django/edadmin/urls/incoming.py @@ -21,11 +21,6 @@ urlpatterns = [ incoming._hx_submission_admissibility, name="_hx_submission_admissibility", ), - path( - "_hx_submission_details_contents", - incoming._hx_submission_details_contents, - name="_hx_submission_details_contents", - ), path( "_hx_plagiarism_internal", incoming._hx_plagiarism_internal, diff --git a/scipost_django/edadmin/views/base.py b/scipost_django/edadmin/views/base.py index 43ca9ccf879b385bc1dca135727e6ff889fe7ff1..c9aa781f54eca7dbe6ac7d10cce02e27727b911d 100644 --- a/scipost_django/edadmin/views/base.py +++ b/scipost_django/edadmin/views/base.py @@ -37,3 +37,13 @@ def _hx_submissions_in_stage(request, stage): "submissions": operator.attrgetter(f"in_stage_{stage}")(submissions)(), } return render(request, "edadmin/_hx_submissions_list.html", context) + + +@login_required +@user_passes_test(is_edadmin) +def _hx_submission_edadmin(request, identifier_w_vn_nr): + submission = get_object_or_404( + Submission, preprint__identifier_w_vn_nr=identifier_w_vn_nr + ) + context = {"submission": submission,} + return render(request, "edadmin/_hx_submission_edadmin.html", context) diff --git a/scipost_django/edadmin/views/incoming.py b/scipost_django/edadmin/views/incoming.py index 1a0d023939a651cf1401004aad4d581c287161e4..49b93715c4a546f1cdbfc43863f30c6bc416edae 100644 --- a/scipost_django/edadmin/views/incoming.py +++ b/scipost_django/edadmin/views/incoming.py @@ -26,29 +26,6 @@ from edadmin.forms import ( ) -@login_required -@user_passes_test(is_edadmin) -def _hx_incoming_list(request): - """ - EdAdmin page for incoming Submissions. - """ - submissions = get_objects_for_user(request.user, "submissions.take_edadmin_actions") - context = { - "submissions": submissions.in_stage_incoming(), - } - return render(request, "edadmin/_hx_submissions_list.html", context) - - -@login_required -@user_passes_test(is_edadmin) -def _hx_submission_details_contents(request, identifier_w_vn_nr): - submission = get_object_or_404( - Submission, preprint__identifier_w_vn_nr=identifier_w_vn_nr - ) - context = {"submission": submission,} - return render(request, "edadmin/_hx_submission_details_contents.html", context) - - ################# # Admissibility # #################