X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=6fc384a4602aa3daf61244fd07451cf682ef64db;hb=c9bda06ba879bace5ed82bd188ac562c35163acf;hp=254e2fdeb13bc26fd7e9a5efaad53083e49ff516;hpb=75fe47c33c066bdac49d2dc2315aec57309c3cdb;p=unfold.git

diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index 254e2fde..6fc384a4 100644
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -50,7 +50,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
                 'resource.hostname', 'resource.type',
                 'resource.network_hrn',
                 'lease.urn',
-                'user.user_hrn',
+                #'user.user_hrn',
                 #'application.measurement_point.counter'
         )
         # for internal use in the querytable plugin;
@@ -68,8 +68,8 @@ class SliceResourceView (LoginRequiredView, ThemeView):
         lease_md = metadata.details_by_object('lease')
         lease_fields = [column['name'] for column in lease_md['column']]
 
-        query_all_lease = Query.get('lease').select(lease_fields)
-        page.enqueue_query(query_all_lease)
+        query_lease_all = Query.get('lease').select(lease_fields)
+        page.enqueue_query(query_lease_all)
 
         # --------------------------------------------------------------------------
         # ALL RESOURCES LIST
@@ -143,7 +143,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
             # center on Paris
             latitude   = 49.,
             longitude  = 9,
-            zoom       = 4,
+            zoom       = 8,
         )
 
         # --------------------------------------------------------------------------
@@ -156,8 +156,9 @@ class SliceResourceView (LoginRequiredView, ThemeView):
             title      = 'Scheduler',
             # this is the query at the core of the slice list
             query = sq_resource,
+            query_lease = sq_lease,
             query_all_resources = query_resource_all,
-            query_lease = query_all_lease,
+            query_all_leases = query_lease_all,
         )
 
         # --------------------------------------------------------------------------
@@ -202,7 +203,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
 
         template_env = {}
         template_env['list_resources'] = list_resources.render(self.request)
-        template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
+#         template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
 
         template_env['columns_editor'] = filter_column_editor.render(self.request)