X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=5659386179b4e92a3e275713313fdb4935a771a1;hb=491bd4d5497b5c431ab35716425f4c95fd2c3696;hp=6e733483d70b99f27fdc37a2a0a7d5e7c079266f;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git diff --git a/portal/urls.py b/portal/urls.py index 6e733483..56593861 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -25,6 +25,7 @@ from django.conf.urls import patterns, include, url from portal.platformsview import PlatformsView from portal.platformview import PlatformView +from portal.resourceview import ResourceView from portal.dashboardview import DashboardView from portal.accountview import AccountView, account_process from portal.contactview import ContactView @@ -57,7 +58,8 @@ urlpatterns = patterns('', #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), url(r'^account/?$', AccountView.as_view(), name='account'), url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'), - url(r'^platform/(?P[\w\.]+)/?$', PlatformView.as_view(), name='platform'), + url(r'^platform/(?P[\w\.\-]+)/?$', PlatformView.as_view(), name='platform'), + url(r'^resource/(?P[\w\.\-\+\:]+)/?$', ResourceView.as_view(), name='resource'), url(r'^slice/?$',SliceView.as_view(),name='slice'), url(r'^slice/(?P[\w\.]+)/?$', SliceView.as_view(),name='slice'), url(r'^account/account_process/?$', account_process), @@ -69,7 +71,7 @@ urlpatterns = patterns('', url(r'^validate/?$', ValidatePendingView.as_view()), # http://stackoverflow.com/questions/2360179/django-urls-how-to-pass-a-list-of-items-via-clean-urls # (r'^validate_action/(?P[^/]+)/(?P\w+)/?$', 'portal.views.pres_view_static'), - (r'^validate_action(?P(?:/\w+)+)/?$', 'portal.actions.validate_action'), + url(r'^validate_action(?P(?:/\w+)+)/?$', 'portal.actions.validate_action'), url(r'^pres_view/?$', PresViewView.as_view(), name='pres_view'), (r'^methods/(?P\w+)/?$', 'portal.views.pres_view_methods'),