From 1f6ce9338dcd613e06724e4ac2dcb0bb433209a2 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Fri, 11 Oct 2013 17:26:13 +0200 Subject: [PATCH] url of portal/platform/x - http://trac.myslice.info/ticket/27 --- portal/sliceview.py | 4 ++-- portal/urls.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/portal/sliceview.py b/portal/sliceview.py index fe95764c..7c77f1f8 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -51,8 +51,8 @@ class SliceView (LoginRequiredAutoLogoutView): main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) main_query.select( 'slice_hrn', - 'resource.resource_hrn', 'resource.hostname', 'resource.type', - #'resource.network_hrn', + 'resource.hrn', 'resource.hostname', 'resource.type', + 'resource.network_hrn', #'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' diff --git a/portal/urls.py b/portal/urls.py index 6e733483..fa68d205 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -57,7 +57,7 @@ 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'^slice/?$',SliceView.as_view(),name='slice'), url(r'^slice/(?P[\w\.]+)/?$', SliceView.as_view(),name='slice'), url(r'^account/account_process/?$', account_process), -- 2.43.0