diff --git a/RIGS/urls.py b/RIGS/urls.py index c32d2e63..01dc1d94 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -78,34 +78,34 @@ urlpatterns = [ 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()), + name='event_detail'), path('event/create/', permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()), name='event_create'), - path('event//', has_oembed(oembed_view="event_oembed")( - rigboard.EventDetail.as_view()), - name='event_detail'), - url(r'^event/(?P\d+)/embed/$', xframe_options_exempt( - login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), - name='event_embed'), - url(r'^event/(?P\d+)/oembed_json/$', - rigboard.EventOembed.as_view(), - name='event_oembed'), - url(r'^event/(?P\d+)/print/$', - permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), - name='event_print'), - url(r'^event/(?P\d+)/ra/$', - permission_required_with_403('RIGS.change_event')(rigboard.EventRA.as_view()), - name='event_ra'), - url(r'^event/(?P\d+)/edit/$', - permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()), - name='event_update'), - url(r'^event/(?P\d+)/duplicate/$', - permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), - name='event_duplicate'), 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())), + name='event_embed'), + 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()), + name='event_print'), + 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()), + name='event_update'), + path('event//duplicate/', + permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), + name='event_duplicate'), - url(r'^event/(?P\d+)/history/$', + path('event//history/', permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), name='event_history', kwargs={'model': models.Event}),