diff --git a/workbench/urls.py b/workbench/urls.py index 5dc89793..97305c81 100644 --- a/workbench/urls.py +++ b/workbench/urls.py @@ -5,7 +5,6 @@ from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from django.urls import path from django.urls import re_path from workbench import views @@ -13,27 +12,27 @@ admin.autodiscover() urlpatterns = [ - path('', views.index, name='workbench_index'), - path( - 'scenario///', + re_path(r'^$', views.index, name='workbench_index'), + re_path( + r'^scenario/(?P[^/]+)/(?P[^/]+)/$', views.show_scenario, name='scenario' ), - path('userlist/', + re_path(r'^userlist/$', views.user_list, name='userlist'), - path( - 'scenario//', + re_path( + r'^scenario/(?P[^/]+)/$', views.show_scenario, name='workbench_show_scenario' ), - path( - 'view///', + re_path( + r'^view/(?P[^/]+)/(?P[^/]+)/$', views.show_scenario, {'template': 'workbench/blockview.html'} ), - path( - 'view//', + re_path( + r'^view/(?P[^/]+)/$', views.show_scenario, {'template': 'workbench/blockview.html'} ), @@ -57,8 +56,8 @@ views.package_resource, name='package_resource' ), - path( - 'reset_state', + re_path( + r'^reset_state$', views.reset_state, name='reset_state' ),