From 227d9ab401eb8c5ecc28dca7ff700213acc68cc5 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 2 May 2013 15:44:32 -0400 Subject: [PATCH 1/1] updated url regex --- plstackapi/core/urls.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plstackapi/core/urls.py b/plstackapi/core/urls.py index 0c9b858..2e8814f 100644 --- a/plstackapi/core/urls.py +++ b/plstackapi/core/urls.py @@ -37,37 +37,37 @@ urlpatterns = patterns('', url(r'^plstackapi/roles/(?P[a-zA-Z0-9]+)/$', RoleRetrieveUpdateDestroy.as_view(), name='role-detail'), url(r'^plstackapi/users/$', UserListCreate.as_view(), name='user-list'), - url(r'^plstackapi/users/(?P[a-zA-Z0-9]+)/$', UserRetrieveUpdateDestroy.as_view(), name='user-detail'), + url(r'^plstackapi/users/(?P[a-zA-Z0-9_\-]+)/$', UserRetrieveUpdateDestroy.as_view(), name='user-detail'), url(r'^plstackapi/keys/$', KeyListCreate.as_view(), name='key-list'), - url(r'^plstackapi/keys/(?P[a-zA-Z0-9]+)/$', KeyRetrieveUpdateDestroy.as_view(), name='key-detail'), + url(r'^plstackapi/keys/(?P[a-zA-Z0-9_\-]+)/$', KeyRetrieveUpdateDestroy.as_view(), name='key-detail'), url(r'^plstackapi/sites/$', SiteListCreate.as_view(), name='site-list'), - url(r'^plstackapi/sites/(?P[a-zA-Z0-9_]+)/$', SiteRetrieveUpdateDestroy.as_view(), name='site-detail'), + url(r'^plstackapi/sites/(?P[a-zA-Z0-9_\-]+)/$', SiteRetrieveUpdateDestroy.as_view(), name='site-detail'), url(r'^plstackapi/site_privileges/$', SitePrivilegeListCreate.as_view(), name='siteprivilege-list'), url(r'^plstackapi/site_privileges/(?P[a-zA-Z0-9_]+)/$', SitePrivilegeRetrieveUpdateDestroy.as_view(), name='siteprivilege-detail'), url(r'^plstackapi/slices/$', SliceListCreate.as_view(), name='slice-list'), - url(r'^plstackapi/slices/(?P[0-9]+)/$', SliceRetrieveUpdateDestroy.as_view(), name='slice-detail'), + url(r'^plstackapi/slices/(?P[a-zA-Z0-9_\-]+)/$', SliceRetrieveUpdateDestroy.as_view(), name='slice-detail'), url(r'^plstackapi/slice_memberships/$', SliceMembershipListCreate.as_view(), name='slice_membership-list'), url(r'^plstackapi/slice_memberships/(?P[0-9]+)/$', SliceMembershipRetrieveUpdateDestroy.as_view(), name='slice_membership-detail'), url(r'^plstackapi/subnets/$', SubnetListCreate.as_view(), name='subnet-list'), - url(r'^plstackapi/subnets/(?P[a-zA-Z0-9_]+)/$', SubnetRetrieveUpdateDestroy.as_view(), name='subnet-detail'), + url(r'^plstackapi/subnets/(?P[a-zA-Z0-9_\-]+)/$', SubnetRetrieveUpdateDestroy.as_view(), name='subnet-detail'), url(r'^plstackapi/slivers/$', SliverListCreate.as_view(), name='sliver-list'), - url(r'^plstackapi/slivers/(?P[a-zA-Z0-9_]+)/$', SliverRetrieveUpdateDestroy.as_view(), name='sliver-detail'), + url(r'^plstackapi/slivers/(?P[a-zA-Z0-9_\-]+)/$', SliverRetrieveUpdateDestroy.as_view(), name='sliver-detail'), url(r'^plstackapi/nodes/$', NodeListCreate.as_view(), name='node-list'), - url(r'^plstackapi/nodes/(?P[a-zA-Z0-9_]+)/$', NodeRetrieveUpdateDestroy.as_view(), name='node-detail'), + url(r'^plstackapi/nodes/(?P[a-zA-Z0-9_\-]+)/$', NodeRetrieveUpdateDestroy.as_view(), name='node-detail'), url(r'^plstackapi/deploymentnetworks/$', DeploymentNetworkListCreate.as_view(), name='deploymentnetwork-list'), - url(r'^plstackapi/deploymentnetworks/(?P[a-zA-Z0-9]+)/$', DeploymentNetworkRetrieveUpdateDestroy.as_view(), name='deploymentnetwork-detail'), + url(r'^plstackapi/deploymentnetworks/(?P[a-zA-Z0-9\-]+)/$', DeploymentNetworkRetrieveUpdateDestroy.as_view(), name='deploymentnetwork-detail'), url(r'^plstackapi/images/$', ImageListCreate.as_view(), name='image-list'), - url(r'^plstackapi/images/(?P[a-zA-Z0-9_]+)/$', ImageRetrieveUpdateDestroy.as_view(), name='image-detail'), + url(r'^plstackapi/images/(?P[a-zA-Z0-9_\-]+)/$', ImageRetrieveUpdateDestroy.as_view(), name='image-detail'), #Adding in rest_framework urls url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')), -- 2.43.0