url of portal/platform/x - http://trac.myslice.info/ticket/27

diff --git a/portal/sliceview.py b/portal/sliceview.py
index fe95764..7c77f1f 100644 (file)
--- 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 6e73348..fa68d20 100644 (file)
--- 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<platformname>[\w\.]+)/?$', PlatformView.as_view(), name='platform'),
+    url(r'^platform/(?P<platformname>[\w\-.]+)/?$', PlatformView.as_view(), name='platform'),
     url(r'^slice/?$',SliceView.as_view(),name='slice'),
     url(r'^slice/(?P<slicename>[\w\.]+)/?$', SliceView.as_view(),name='slice'),
     url(r'^account/account_process/?$', account_process),