From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 11 Oct 2013 19:24:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~12^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9961edb421c6156048be5688d249047daf250e70;hp=3cbd1a536e44bed0fecce6a7d0be57b2c6d03748;p=myslice.git

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 3b898791..a4efdbd1 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'