Reorganize edadmin urls

scipost_django/edadmin/templates/edadmin/_hx_submissions_list.html

@@ -30,7 +30,7 @@
       </div>
     </summary>
     <div id="submission-{{ submission.pk }}-edadmin"
-	 hx-get="{% url 'edadmin:_hx_submission_edadmin' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
+	 hx-get="{% url 'edadmin:_hx_submission' 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>

scipost_django/edadmin/urls/__init__.py

@@ -2,32 +2,12 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.urls import include, path, register_converter
-
-from ..converters import SubmissionStageSlugConverter
-from ..views import base
+from django.urls import include, path
 
 app_name = "edadmin"
 
 
-register_converter(SubmissionStageSlugConverter, "stage")
-
 urlpatterns = [
-    path("", base.edadmin, name="edadmin"),
-    path(
-        "<stage:stage>",
-        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("", include("edadmin.urls.base")),
     path("incoming/", include("edadmin.urls.incoming")),
 ]

scipost_django/edadmin/urls/base.py

+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+from django.urls import include, path, register_converter
+
+from ..converters import SubmissionStageSlugConverter
+from ..views import base
+
+register_converter(SubmissionStageSlugConverter, "stage")
+
+
+urlpatterns = [
+    path("", base.edadmin, name="edadmin"),
+    path(
+        "<stage:stage>",
+        base._hx_submissions_in_stage,
+        name="_hx_submissions_in_stage",
+    ),
+    path(
+        "<identifier:identifier_w_vn_nr>/",
+        include([
+            path(
+                "",
+                base._hx_submission,
+                name="_hx_submission",
+            ),
+        ]),
+    ),
+]

scipost_django/edadmin/urls/incoming.py

@@ -8,41 +8,51 @@ from ..views import incoming
 
 
 urlpatterns = [
-    path(
-        "_hx_incoming_list",
-        incoming._hx_incoming_list,
-        name="_hx_incoming_list",
-    ),
-    path(
+    path( # "incoming/<identifier>/"
         "<identifier:identifier_w_vn_nr>/",
         include([
-            path(
-                "_hx_submission_admissibility",
+            path( # "incoming/<identifier>/admissibility"
+                "admissibility",
                 incoming._hx_submission_admissibility,
                 name="_hx_submission_admissibility",
             ),
-            path(
-                "_hx_plagiarism_internal",
-                incoming._hx_plagiarism_internal,
-                name="_hx_plagiarism_internal",
-            ),
-            path(
-                "_hx_plagiarism_internal_assess",
-                incoming._hx_plagiarism_internal_assess,
-                name="_hx_plagiarism_internal_assess",
-            ),
-            path(
-                "_hx_plagiarism_iThenticate",
-                incoming._hx_plagiarism_iThenticate,
-                name="_hx_plagiarism_iThenticate",
-            ),
-            path(
-                "_hx_plagiarism_iThenticate_assess",
-                incoming._hx_plagiarism_iThenticate_assess,
-                name="_hx_plagiarism_iThenticate_assess",
-            ),
-            path(
-                "_hx_submission_admission",
+            path( # "incoming/<identifier>/plagiarism/"
+                "plagiarism/",
+                include([
+                    path( # "incoming/<identifier>/plagiarism/internal/"
+                        "internal/",
+                        include([
+                            path(
+                                "",
+                                incoming._hx_plagiarism_internal,
+                                name="_hx_plagiarism_internal",
+                            ),
+                            path(
+                                "assess",
+                                incoming._hx_plagiarism_internal_assess,
+                                name="_hx_plagiarism_internal_assess",
+                            ),
+                            ]),
+                    ), # end "internal/"
+                    path( # "incoming/<identifier>/plagiarism/iThenticate/"
+                        "iThenticate/",
+                        include([
+                            path(
+                                "",
+                                incoming._hx_plagiarism_iThenticate,
+                                name="_hx_plagiarism_iThenticate",
+                            ),
+                            path(
+                                "assess",
+                                incoming._hx_plagiarism_iThenticate_assess,
+                                name="_hx_plagiarism_iThenticate_assess",
+                            ),
+                        ]),
+                    ), # end "iThenticate/"
+                ]),
+            ), # end "plagiarism/"
+            path( # "incoming/<identifier>/admission"
+                "admission",
                 incoming._hx_submission_admission,
                 name="_hx_submission_admission",
             ),

scipost_django/edadmin/views/base.py

@@ -6,7 +6,7 @@ import operator
 
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.http import Http404
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
 
 from guardian.shortcuts import get_objects_for_user
 
@@ -41,9 +41,9 @@ def _hx_submissions_in_stage(request, stage):
 
 @login_required
 @user_passes_test(is_edadmin)
-def _hx_submission_edadmin(request, identifier_w_vn_nr):
+def _hx_submission(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)
+    return render(request, "edadmin/_hx_submission.html", context)