Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	portal/urls.py

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 3b89879..a4efdbd 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'