From 89ddb094593e1bc988445f24cf003e4869e5f81b Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Wed, 18 Mar 2020 00:32:53 +0000 Subject: [PATCH] Port (most) RIGS urls to path() --- RIGS/urls.py | 194 ++++++++++++++++++++------------------------------- 1 file changed, 77 insertions(+), 117 deletions(-) diff --git a/RIGS/urls.py b/RIGS/urls.py index 4d763106..9f299fd8 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -9,150 +9,111 @@ from RIGS import finance, ical, models, rigboard, versioning, views urlpatterns = [ path('', login_required(views.Index.as_view()), name='index'), - url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'), - url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'), + path('closemodal/', views.CloseModal.as_view(), name='closemodal'), + path('search_help/', views.SearchHelp.as_view(), name='search_help'), # People - url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()), - name='person_list'), - url(r'^people/add/$', - permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()), - name='person_create'), - url(r'^people/(?P\d+)/$', - permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()), - name='person_detail'), - url(r'^people/(?P\d+)/history/$', - permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()), - name='person_history', kwargs={'model': models.Person}), - url(r'^people/(?P\d+)/edit/$', - permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()), - name='person_update'), + path('people/', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()), + name='person_list'), + path('people/add/', permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()), + name='person_create'), + path('people//', permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()), + name='person_detail'), + path('people//history/', permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()), + name='person_history', kwargs={'model': models.Person}), + path('people//edit/', permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()), + name='person_update'), # Organisations - url(r'^organisations/$', - permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()), - name='organisation_list'), - url(r'^organisations/add/$', - permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()), - name='organisation_create'), - url(r'^organisations/(?P\d+)/$', - permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), - name='organisation_detail'), - url(r'^organisations/(?P\d+)/history/$', - permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()), - name='organisation_history', kwargs={'model': models.Organisation}), - url(r'^organisations/(?P\d+)/edit/$', - permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), - name='organisation_update'), + path('organisations/', permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()), + name='organisation_list'), + path('organisations/add/', permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()), + name='organisation_create'), + path('organisations//', permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), + name='organisation_detail'), + path('organisations//history/', permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()), + name='organisation_history', kwargs={'model': models.Organisation}), + path('organisations//edit/', permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), + name='organisation_update'), # Venues - url(r'^venues/$', - permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()), - name='venue_list'), - url(r'^venues/add/$', - permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()), - name='venue_create'), - url(r'^venues/(?P\d+)/$', - permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()), - name='venue_detail'), - url(r'^venues/(?P\d+)/history/$', - permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()), - name='venue_history', kwargs={'model': models.Venue}), - url(r'^venues/(?P\d+)/edit/$', - permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()), - name='venue_update'), + path('venues/', permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()), + name='venue_list'), + path('venues/add/', permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()), + name='venue_create'), + path('venues//', permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()), + name='venue_detail'), + path('venues//history/', permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()), + name='venue_history', kwargs={'model': models.Venue}), + path('venues//edit/', permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()), + name='venue_update'), # Rigboard - url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'), - url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), - name='web_calendar'), + path('rigboard/', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'), + path('rigboard/calendar/', login_required()(rigboard.WebCalendar.as_view()), + name='web_calendar'), url(r'^rigboard/calendar/(?P(month|week|day))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), url(r'^rigboard/calendar/(?P(month|week|day))/(?P(\d{4}-\d{2}-\d{2}))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), - url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')), + path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')), path('rigboard/activity/', permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()), name='activity_table'), path('rigboard/activity/feed/', permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()), name='activity_feed'), - path('event//', has_oembed(oembed_view="event_oembed")( - rigboard.EventDetail.as_view()), + path('event//', has_oembed(oembed_view="event_oembed")(rigboard.EventDetail.as_view()), name='event_detail'), - path('event/create/', - permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()), + path('event/create/', permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()), name='event_create'), path('event/archive/', login_required()(rigboard.EventArchive.as_view()), name='event_archive'), - path('event//embed/', xframe_options_exempt( - login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), + path('event//embed/', xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), name='event_embed'), - path('event//oembed_json/', - rigboard.EventOembed.as_view(), + path('event//oembed_json/', rigboard.EventOembed.as_view(), name='event_oembed'), - path('event//print/', - permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), + path('event//print/', permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), name='event_print'), - path('event//ra/', - permission_required_with_403('RIGS.change_event')(rigboard.EventRA.as_view()), + path('event//ra/', permission_required_with_403('RIGS.change_event')(rigboard.EventRA.as_view()), name='event_ra'), - path('event//edit/', - permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()), + path('event//edit/', permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()), name='event_update'), - path('event//duplicate/', - permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), + path('event//duplicate/', permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), name='event_duplicate'), - path('event//history/', - permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), + path('event//history/', permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), name='event_history', kwargs={'model': models.Event}), # Finance - url(r'^invoice/$', - permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()), - name='invoice_list'), - url(r'^invoice/archive/$', - permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()), - name='invoice_archive'), - url(r'^invoice/waiting/$', - permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()), - name='invoice_waiting'), + path('invoice/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()), + name='invoice_list'), + path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()), + name='invoice_archive'), + path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()), + name='invoice_waiting'), - url(r'^event/(?P\d+)/invoice/$', - permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()), - name='invoice_event'), + path('event//invoice/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()), + name='invoice_event'), - url(r'^invoice/(?P\d+)/$', - permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()), - name='invoice_detail'), - url(r'^invoice/(?P\d+)/print/$', - permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()), - name='invoice_print'), - url(r'^invoice/(?P\d+)/void/$', - permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()), - name='invoice_void'), - url(r'^invoice/(?P\d+)/delete/$', - permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), - name='invoice_delete'), - url(r'^payment/create/$', - permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()), - name='payment_create'), - url(r'^payment/(?P\d+)/delete/$', - permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()), - name='payment_delete'), + path('invoice//', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()), + name='invoice_detail'), + path('invoice//print/', permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()), + name='invoice_print'), + path('invoice//void/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()), + name='invoice_void'), + path('invoice//delete/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), + name='invoice_delete'), + path('payment/create/', permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()), + name='payment_create'), + path('payment//delete/', permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()), + name='payment_delete'), # Client event authorisation - path('event//auth/', - permission_required_with_403('RIGS.change_event')( - rigboard.EventAuthorisationRequest.as_view() - ), + path('event//auth/', permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()), name='event_authorise_request'), - url(r'^event/(?P\d+)/auth/preview/$', - permission_required_with_403('RIGS.change_event')( - rigboard.EventAuthoriseRequestEmailPreview.as_view() - ), - name='event_authorise_preview'), + path('event//auth/preview/', permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()), + name='event_authorise_preview'), url(r'^event/(?P\d+)/(?P[-:\w]+)/$', rigboard.EventAuthorise.as_view(), name='event_authorise'), @@ -161,17 +122,16 @@ urlpatterns = [ name="ics_calendar"), # API - url(r'^api/(?P\w+)/$', login_required(views.SecureAPIRequest.as_view()), - name="api_secure"), - url(r'^api/(?P\w+)/(?P\d+)/$', login_required(views.SecureAPIRequest.as_view()), - name="api_secure"), + path('api//', login_required(views.SecureAPIRequest.as_view()), + name="api_secure"), + path('api///', login_required(views.SecureAPIRequest.as_view()), + name="api_secure"), # Risk assessment API - url(r'^log_risk_assessment/$', rigboard.LogRiskAssessment.as_view(), name='log_risk_assessment'), + path('log_risk_assessment/', rigboard.LogRiskAssessment.as_view(), name='log_risk_assessment'), - # Legacy URL's - url(r'^rig/show/(?P\d+)/$', - RedirectView.as_view(permanent=True, pattern_name='event_detail')), - url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')), - url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')), + # Legacy URLs + path('rig/show//', RedirectView.as_view(permanent=True, pattern_name='event_detail')), + path('bookings/', RedirectView.as_view(permanent=True, pattern_name='rigboard')), + path('bookings/past/', RedirectView.as_view(permanent=True, pattern_name='event_archive')), ]