diff --git a/wye/organisations/urls.py b/wye/organisations/urls.py index c10eb60..a8aecf5 100644 --- a/wye/organisations/urls.py +++ b/wye/organisations/urls.py @@ -7,13 +7,13 @@ urlpatterns = [ url(r'^create/$', OrganisationCreate.as_view(), name="organisation_create"), - url(r'^(?P\d+)/(?Pactive|deactive)/$', + url(r'^(?P[0-9]+)/(?Pactive|deactive)/$', OrganisationDeactive.as_view(), name="organisation_delete"), - url(r'^(?P\d+)/edit/$', + url(r'^(?P[0-9]+)/edit/$', OrganisationUpdate.as_view(), name="organisation_update"), - url(r'^(?P\d+)/member-add/$', + url(r'^(?P[0-9]+)/member-add/$', OrganisationMemberAdd.as_view(), name="organisation_member_add"), - url(r'^(?P\d+)/$', OrganisationDetail.as_view(), + url(r'^(?P[0-9]+)/$', OrganisationDetail.as_view(), name="organisation_details"), url(r'^$', OrganisationList.as_view(), name="organisation_list"), diff --git a/wye/organisations/views.py b/wye/organisations/views.py index c8c57ab..b694d7f 100644 --- a/wye/organisations/views.py +++ b/wye/organisations/views.py @@ -175,7 +175,7 @@ def get_token(self, user, **kwargs): def get_urls(self): return patterns('', - url(r'^(?P[\d]+)-(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/', + url(r'^(?P[0-9]+)-(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/', view=self.activate_view, name="invitation_register") ) diff --git a/wye/regions/urls.py b/wye/regions/urls.py index 9d51d93..1750981 100644 --- a/wye/regions/urls.py +++ b/wye/regions/urls.py @@ -4,17 +4,17 @@ urlpatterns = [ url(r'^lead/create/$', views.RegionalLeadCreateView.as_view(), name="lead-create"), - url(r'^lead/(?P\d+)/edit/$', views.RegionalLeadUpdateView.as_view(), + url(r'^lead/(?P[0-9]+)/edit/$', views.RegionalLeadUpdateView.as_view(), name="lead-update"), url(r'^lead/get_leads/(?P\w+)/$', views.RegionalLeadCreateView().get_leads, name='get_leads'), url(r'^state/create/$', views.StateCreateView.as_view(), name="state-create"), - url(r'^state/(?P\d+)/edit/$', views.StateEditView.as_view(), + url(r'^state/(?P[0-9]+)/edit/$', views.StateEditView.as_view(), name="state-update"), url(r'^location/create/$', views.LocationCreateView.as_view(), name="location-create"), - url(r'^location/(?P\d+)/edit/$', views.LocationUpdateView.as_view(), + url(r'^location/(?P[0-9]+)/edit/$', views.LocationUpdateView.as_view(), name="location-update"), url(r'^$', views.RegionalListView.as_view(), name="regions-home-page") diff --git a/wye/urls.py b/wye/urls.py index e5e2c77..11494fc 100644 --- a/wye/urls.py +++ b/wye/urls.py @@ -49,7 +49,7 @@ include('wye.regions.urls', namespace="regions")), url(r'^reports/', include('wye.reports.urls', namespace="reports")), - url(r'^invitation/(?P[\d]+)-(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/', + url(r'^invitation/(?P[0-9]+)-(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/', view=activate_view, name="invitation_register"), url(r'^$', HomePageView.as_view(), name='home-page'), diff --git a/wye/workshops/urls.py b/wye/workshops/urls.py index 365f392..237f79a 100644 --- a/wye/workshops/urls.py +++ b/wye/workshops/urls.py @@ -14,20 +14,20 @@ urlpatterns = [ url(r'^$', workshop_list, name="workshop_list"), - url(r'^(?P\d+)/$', workshop_details, name="workshop_detail"), + url(r'^(?P[0-9]+)/$', workshop_details, name="workshop_detail"), url(r'^create/$', workshop_create, name="workshop_create"), - url(r'^update/(?P\d+)/$', + url(r'^update/(?P[0-9]+)/$', WorkshopUpdate.as_view(), name="workshop_update"), - url(r'^(?P\d+)/(?Pactive|deactive)/$', + url(r'^(?P[0-9]+)/(?Pactive|deactive)/$', WorkshopToggleActive.as_view(), name="workshop_toggle"), - url(r'^(?P\d+)/(?Paccept|reject|hold|publish|decline)/$', + url(r'^(?P[0-9]+)/(?Paccept|reject|hold|publish|decline)/$', WorkshopAction.as_view(), name="workshop_action"), - url(r'^feedback/(?P\d+)/$', + url(r'^feedback/(?P[0-9]+)/$', workshop_feedback_view, name="workshop_feedback"), - url(r'^update-volunteer/(?P\d+)$', + url(r'^update-volunteer/(?P[0-9]+)$', workshop_update_volunteer, name="workshop_update_volunteer"), - url(r'^workshop-opt-in-as-volunteer/(?P\d+)$', + url(r'^workshop-opt-in-as-volunteer/(?P[0-9]+)$', workshop_accept_as_volunteer, name="workshop_opt_in_volunteer"), - url(r'^workshop-opt-out-as-volunteer/(?P\d+)$', + url(r'^workshop-opt-out-as-volunteer/(?P[0-9]+)$', workshop_opt_out_as_volunteer, name="workshop_opt_out_volunteer"), ]