Update urlpatterns (up to `invitations`)

scipost_django/finances/urls.py

@@ -2,7 +2,7 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
+from django.urls import path
 from django.views.generic import TemplateView
 
 from . import views
@@ -10,50 +10,92 @@ from . import views
 app_name = 'finances'
 
 urlpatterns = [
-    url(
-        r'^$',
+    path(
+        '',
         views.finances,
         name='finances'
     ),
-    url(
-        r'^business_model/$',
+    path(
+        'business_model/',
         TemplateView.as_view(template_name='finances/business_model.html'),
         name='business_model'
     ),
-    url(
-        r'^apex$',
+    path(
+        'apex',
         views.apex,
         name='apex'
     ),
 
     # Subsidies
-    url(r'^subsidies/$', views.SubsidyListView.as_view(), name='subsidies'),
-    url(r'^subsidies/add/$', views.SubsidyCreateView.as_view(), name='subsidy_create'),
-    url(r'^subsidies/(?P<pk>[0-9]+)/update/$', views.SubsidyUpdateView.as_view(),
-        name='subsidy_update'),
-    url(r'^subsidies/(?P<pk>[0-9]+)/delete/$', views.SubsidyDeleteView.as_view(),
-        name='subsidy_delete'),
-    url(r'^subsidies/(?P<pk>[0-9]+)/$', views.SubsidyDetailView.as_view(), name='subsidy_details'),
-    url(r'^subsidies/(?P<subsidy_id>[0-9]+)/toggle_amount_visibility/$',
+    path(
+        'subsidies/',
+        views.SubsidyListView.as_view(),
+        name='subsidies'
+    ),
+    path(
+        'subsidies/add/',
+        views.SubsidyCreateView.as_view(),
+        name='subsidy_create'
+    ),
+    path(
+        'subsidies/<int:pk>/update/',
+        views.SubsidyUpdateView.as_view(),
+        name='subsidy_update'
+    ),
+    path(
+        'subsidies/<int:pk>/delete/',
+        views.SubsidyDeleteView.as_view(),
+        name='subsidy_delete'
+    ),
+    path(
+        'subsidies/<int:pk>/',
+        views.SubsidyDetailView.as_view(),
+        name='subsidy_details'
+    ),
+    path(
+        'subsidies/<int:subsidy_id>/toggle_amount_visibility/',
         views.subsidy_toggle_amount_public_visibility,
-        name='subsidy_toggle_amount_public_visibility'),
-    url(r'^subsidies/(?P<subsidy_id>[0-9]+)/attachments/add/$',
+        name='subsidy_toggle_amount_public_visibility'
+    ),
+    path(
+        'subsidies/<int:subsidy_id>/attachments/add/',
         views.SubsidyAttachmentCreateView.as_view(),
-        name='subsidyattachment_create'),
-    url(r'^subsidies/attachments/(?P<pk>[0-9]+)/update/$',
+        name='subsidyattachment_create'
+    ),
+    path(
+        'subsidies/attachments/<int:pk>/update/',
         views.SubsidyAttachmentUpdateView.as_view(),
-        name='subsidyattachment_update'),
-    url(r'^subsidies/attachments/(?P<pk>[0-9]+)/delete/$',
+        name='subsidyattachment_update'
+    ),
+    path(
+        'subsidies/attachments/<int:pk>/delete/',
         views.SubsidyAttachmentDeleteView.as_view(),
-        name='subsidyattachment_delete'),
-    url(r'^subsidies/attachments/(?P<attachment_id>[0-9]+)/toggle_visibility/$',
+        name='subsidyattachment_delete'
+    ),
+    path(
+        'subsidies/attachments/<int:attachment_id>/toggle_visibility/',
         views.subsidy_attachment_toggle_public_visibility,
-        name='subsidy_attachment_toggle_public_visibility'),
-    url(r'^subsidies/(?P<subsidy_id>[0-9]+)/attachments/(?P<attachment_id>[0-9]+)$',
-        views.subsidy_attachment, name='subsidy_attachment'),
+        name='subsidy_attachment_toggle_public_visibility'
+    ),
+    path(
+        'subsidies/<int:subsidy_id>/attachments/<int:attachment_id>',
+        views.subsidy_attachment, name='subsidy_attachment'
+    ),
 
     # Timesheets
-    url(r'^timesheets$', views.timesheets, name='timesheets'),
-    url(r'^timesheets/detailed$', views.timesheets_detailed, name='timesheets_detailed'),
-    url(r'^logs/(?P<slug>\d+)/delete$', views.LogDeleteView.as_view(), name='log_delete'),
+    path(
+        'timesheets',
+        views.timesheets,
+        name='timesheets'
+    ),
+    path(
+        'timesheets/detailed',
+        views.timesheets_detailed,
+        name='timesheets_detailed'
+    ),
+    path(
+        'logs/<slug:slug>/delete',
+        views.LogDeleteView.as_view(),
+        name='log_delete'
+    ),
 ]

scipost_django/forums/urls.py

@@ -2,85 +2,85 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 app_name = 'forums'
 
 urlpatterns = [
-    url(
-        r'^forum/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/$',
+    path(
+        'forum/<str:parent_model>/<int:parent_id>/add/',
         views.ForumCreateView.as_view(),
         name='forum_create'
     ),
-    url(
-        r'^add/$',
+    path(
+        'add/',
         views.ForumCreateView.as_view(),
         name='forum_create'
     ),
-    url(
-        r'^meeting/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/$',
+    path(
+        'meeting/<str:parent_model>/<int:parent_id>/add/',
         views.MeetingCreateView.as_view(),
         name='meeting_create'
     ),
-    url(
-        r'^meeting/add/$',
+    path(
+        'meeting/add/',
         views.MeetingCreateView.as_view(),
         name='meeting_create'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/$',
+    path(
+        '<slug:slug>/',
         views.ForumDetailView.as_view(),
         name='forum_detail'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/update/$',
+    path(
+        '<slug:slug>/update/',
         views.ForumUpdateView.as_view(),
         name='forum_update'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/delete/$',
+    path(
+        '<slug:slug>/delete/',
         views.ForumDeleteView.as_view(),
         name='forum_delete'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/permissions/(?P<group_id>[0-9]+)/$',
+    path(
+        '<slug:slug>/permissions/<int:group_id>/',
         views.ForumPermissionsView.as_view(),
         name='forum_permissions'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/permissions/$',
+    path(
+        '<slug:slug>/permissions/',
         views.ForumPermissionsView.as_view(),
         name='forum_permissions'
     ),
-    url(
-        r'^$',
+    path(
+        '',
         views.ForumListView.as_view(),
         name='forums'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/post/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/$',
+    path(
+        '<slug:slug>/post/<str:parent_model>/<int:parent_id>/add/',
         views.PostCreateView.as_view(),
         name='post_create'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/motion/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/$',
+    path(
+        '<slug:slug>/motion/<str:parent_model>/<int:parent_id>/add/',
         views.MotionCreateView.as_view(),
         name='motion_create'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/post/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/confirm/$',
+    path(
+        '<slug:slug>/post/<str:parent_model>/<int:parent_id>/add/confirm/',
         views.PostConfirmCreateView.as_view(),
         name='post_confirm_create'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/motion/(?P<parent_model>[a-z]+)/(?P<parent_id>[0-9]+)/add/confirm/$',
+    path(
+        '<slug:slug>/motion/<str:parent_model>/<int:parent_id>/add/confirm/',
         views.MotionConfirmCreateView.as_view(),
         name='motion_confirm_create'
     ),
-    url(
-        r'^(?P<slug>[\w-]+)/motion/(?P<motion_id>[0-9]+)/(?P<vote>[YMNA])/$',
+    path(
+        '<slug:slug>/motion/<int:motion_id>/<str:vote>/',
         views.motion_vote,
         name='motion_vote'
     ),

scipost_django/forums/views.py

@@ -354,6 +354,8 @@ def motion_vote(request, slug, motion_id, vote):
             motion.in_disagreement.add(request.user)
         elif vote == 'A':
             motion.in_abstain.add(request.user)
+        else:
+            raise Http404
         motion.save()
     else:
         messages.warning(request, 'You do not have voting rights on this Motion.')

scipost_django/funders/urls.py

@@ -2,7 +2,6 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
 from django.urls import path
 
 from . import views
@@ -20,14 +19,39 @@ urlpatterns = [
         views.GrantAutocompleteView.as_view(),
         name='grant-autocomplete'
     ),
-    url(r'^$', views.funders, name='funders'),
-    url(r'^dashboard$', views.funders_dashboard, name='funders_dashboard'),
-    url(r'^query_crossref_for_funder$', views.query_crossref_for_funder,
-        name='query_crossref_for_funder'),
-    url(r'^add$', views.add_funder, name='add_funder'),
-    url(r'^(?P<funder_id>[0-9]+)/$', views.funder_publications, name='funder_publications'),
-    url(r'^grants/add$', views.CreateGrantView.as_view(), name='add_grant'),
-    url(r'^(?P<pk>[0-9]+)/link_to_organization/$',
+    path(
+        '',
+        views.funders,
+        name='funders'
+    ),
+    path(
+        'dashboard',
+        views.funders_dashboard,
+        name='funders_dashboard'
+    ),
+    path(
+        'query_crossref_for_funder',
+        views.query_crossref_for_funder,
+        name='query_crossref_for_funder'
+    ),
+    path(
+        'add',
+        views.add_funder,
+        name='add_funder'
+    ),
+    path(
+        '<int:funder_id>/',
+        views.funder_publications,
+        name='funder_publications'
+    ),
+    path(
+        'grants/add',
+        views.CreateGrantView.as_view(),
+        name='add_grant'
+    ),
+    path(
+        '<int:pk>/link_to_organization/',
         views.LinkFunderToOrganizationView.as_view(),
-        name='link_to_organization'),
+        name='link_to_organization'
+    ),
 ]

scipost_django/guides/urls.py

@@ -2,32 +2,46 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
 from django.contrib.auth.decorators import permission_required
+from django.urls import path
 from django.views.generic import TemplateView
 
 app_name = 'guides'
 
 urlpatterns = [
-    url(r'^$',
+    path(
+        '',
         permission_required('scipost.can_view_docs_scipost')(
-            TemplateView.as_view(template_name='guides/guides_index.html')),
-        name='guides_index'),
-    url(r'^editorial/submissions/submission_processing$',
+            TemplateView.as_view(
+                template_name='guides/guides_index.html')),
+        name='guides_index'
+    ),
+    path(
+        'editorial/submissions/submission_processing',
         permission_required('scipost.can_view_docs_scipost')(
-        TemplateView.as_view(
-            template_name='guides/editorial/submissions/submission_prescreening.html')),
-        name='submission_prescreening'),
-    url(r'^editorial/production/initial_production$',
+            TemplateView.as_view(
+                template_name='guides/editorial/submissions/submission_prescreening.html')),
+        name='submission_prescreening'
+    ),
+    path(
+        'editorial/production/initial_production',
         permission_required('scipost.can_view_docs_scipost')(
-        TemplateView.as_view(template_name='guides/editorial/production/initial_production.html')),
-        name='initial_production'),
-    url(r'^editorial/production/proofs$',
+            TemplateView.as_view(
+                template_name='guides/editorial/production/initial_production.html')),
+        name='initial_production'
+    ),
+    path(
+        'editorial/production/proofs',
         permission_required('scipost.can_view_docs_scipost')(
-        TemplateView.as_view(template_name='guides/editorial/production/proofs.html')),
-        name='proofs'),
-    url(r'^editorial/production/online_publication$',
+        TemplateView.as_view(
+            template_name='guides/editorial/production/proofs.html')),
+        name='proofs'
+    ),
+    path(
+        'editorial/production/online_publication',
         permission_required('scipost.can_view_docs_scipost')(
-        TemplateView.as_view(template_name='guides/editorial/production/online_publication.html')),
-        name='online_publication'),
+            TemplateView.as_view(
+                template_name='guides/editorial/production/online_publication.html')),
+        name='online_publication'
+    ),
 ]

scipost_django/helpdesk/urls.py

@@ -2,85 +2,85 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 app_name = 'helpdesk'
 
 urlpatterns = [
-    url(
-        r'^$',
+    path(
+        '',
         views.HelpdeskView.as_view(),
         name='helpdesk'
     ),
-    url(
-        r'^queue/(?P<parent_slug>[\w-]+)/add/$',
+    path(
+        'queue/<slug:parent_slug>/add/',
         views.QueueCreateView.as_view(),
         name='queue_create'
     ),
-    url(
-        r'^queue/add/$',
+    path(
+        'queue/add/',
         views.QueueCreateView.as_view(),
         name='queue_create'
     ),
-    url(
-        r'^queue/(?P<slug>[\w-]+)/update/$',
+    path(
+        'queue/<slug:slug>/update/',
         views.QueueUpdateView.as_view(),
         name='queue_update'
     ),
-    url(
-        r'^queue/(?P<slug>[\w-]+)/delete/$',
+    path(
+        'queue/<slug:slug>/delete/',
         views.QueueDeleteView.as_view(),
         name='queue_delete'
     ),
-    url(
-        r'^queue/(?P<slug>[\w-]+)/$',
+    path(
+        'queue/<slug:slug>/',
         views.QueueDetailView.as_view(),
         name='queue_detail'
     ),
-    url(
-        r'^ticket/add/(?P<concerning_type_id>[0-9]+)/(?P<concerning_object_id>[0-9]+)/$',
+    path(
+        'ticket/add/<int:concerning_type_id>/<int:concerning_object_id>/',
         views.TicketCreateView.as_view(),
         name='ticket_create'
     ),
-    url(
-        r'^ticket/add/$',
+    path(
+        'ticket/add/',
         views.TicketCreateView.as_view(),
         name='ticket_create'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/update/$',
+    path(
+        'ticket/<int:pk>/update/',
         views.TicketUpdateView.as_view(),
         name='ticket_update'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/delete/$',
+    path(
+        'ticket/<int:pk>/delete/',
         views.TicketDeleteView.as_view(),
         name='ticket_delete'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/assign/$',
+    path(
+        'ticket/<int:pk>/assign/',
         views.TicketAssignView.as_view(),
         name='ticket_assign'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/$',
+    path(
+        'ticket/<int:pk>/',
         views.TicketDetailView.as_view(),
         name='ticket_detail'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/followup/$',
+    path(
+        'ticket/<int:pk>/followup/',
         views.TicketFollowupView.as_view(),
         name='ticket_followup'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/resolved/$',
+    path(
+        'ticket/<int:pk>/resolved/',
         views.TicketMarkResolved.as_view(),
         name='ticket_mark_resolved'
     ),
-    url(
-        r'^ticket/(?P<pk>[0-9]+)/closed/$',
+    path(
+        'ticket/<int:pk>/closed/',
         views.TicketMarkClosed.as_view(),
         name='ticket_mark_closed'
     ),

scipost_django/invitations/urls.py

@@ -2,37 +2,86 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 app_name = 'invitations'
 
 urlpatterns = [
-    url(r'^$', views.RegistrationInvitationsView.as_view(), name='list'),
-    url(r'^sent$', views.RegistrationInvitationsSentView.as_view(), name='list_sent'),
-    url(r'^contributors$',
-        views.RegistrationInvitationsDraftContributorView.as_view(), name='list_contributors'),
-    url(r'^fellows$', views.RegistrationInvitationsFellowView.as_view(), name='list_fellows'),
-    url(r'^new$', views.create_registration_invitation_or_citation, name='new'),
-    url(r'^(?P<pk>[0-9]+)/$', views.RegistrationInvitationsUpdateView.as_view(), name='update'),
-    url(r'^(?P<pk>[0-9]+)/add_citation$', views.RegistrationInvitationsAddCitationView.as_view(),
-        name='add_citation'),
-    url(r'^(?P<pk>[0-9]+)/delete$', views.RegistrationInvitationsDeleteView.as_view(),
-        name='delete'),
-    url(r'^(?P<pk>[0-9]+)/merge$', views.RegistrationInvitationsMergeView.as_view(),
-        name='merge'),
-    url(r'^(?P<pk>[0-9]+)/mark/(?P<label>sent)$', views.RegistrationInvitationsMarkView.as_view(),
-        name='mark'),
-    url(r'^(?P<pk>[0-9]+)/map_to_contributor/(?P<contributor_id>[0-9]+)/$',
+    path(
+        '',
+        views.RegistrationInvitationsView.as_view(),
+        name='list'
+    ),
+    path(
+        'sent',
+        views.RegistrationInvitationsSentView.as_view(),
+        name='list_sent'
+    ),
+    path(
+        'contributors',
+        views.RegistrationInvitationsDraftContributorView.as_view(),
+        name='list_contributors'
+    ),
+    path(
+        'fellows',
+        views.RegistrationInvitationsFellowView.as_view(),
+        name='list_fellows'
+    ),
+    path(
+        'new',
+        views.create_registration_invitation_or_citation,
+        name='new'
+    ),
+    path(
+        '<int:pk>/',
+        views.RegistrationInvitationsUpdateView.as_view(),
+        name='update'
+    ),
+    path(
+        '<int:pk>/add_citation',
+        views.RegistrationInvitationsAddCitationView.as_view(),
+        name='add_citation'
+    ),
+    path(
+        '<int:pk>/delete',
+        views.RegistrationInvitationsDeleteView.as_view(),
+        name='delete'
+    ),
+    path(
+        '<int:pk>/merge',
+        views.RegistrationInvitationsMergeView.as_view(),
+        name='merge'
+    ),
+    path(
+        '<int:pk>/mark/<str:label>',
+        views.RegistrationInvitationsMarkView.as_view(),
+        name='mark'
+    ),
+    path(
+        '<int:pk>/map_to_contributor/<int:contributor_id>/',
         views.RegistrationInvitationsMapToContributorView.as_view(),
-        name='map_to_contributor'),
-    url(r'^(?P<pk>[0-9]+)/send_reminder$', views.RegistrationInvitationsReminderView.as_view(),
-        name='send_reminder'),
-    url(r'^cleanup$', views.cleanup, name='cleanup'),
-
-    url(r'^citations$', views.CitationNotificationsView.as_view(),
-        name='citation_notification_list'),
-    url(r'^citations/(?P<pk>[0-9]+)$', views.CitationNotificationsProcessView.as_view(),
-        name='citation_notification_process'),
+        name='map_to_contributor'
+    ),
+    path(
+        '<int:pk>/send_reminder',
+        views.RegistrationInvitationsReminderView.as_view(),
+        name='send_reminder'
+    ),
+    path(
+        'cleanup',
+        views.cleanup,
+        name='cleanup'
+    ),
+    path(
+        'citations',
+        views.CitationNotificationsView.as_view(),
+        name='citation_notification_list'
+    ),
+    path(
+        'citations/<int:pk>',
+        views.CitationNotificationsProcessView.as_view(),
+        name='citation_notification_process'
+    ),
 ]