X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=6c9b46c7d942c594fef38fa830b28e15c2e85605;hb=f4201a3e21c8623dbe74f707b1841e8c912f573b;hp=e3e978e3ce606a8114df787579cf265e53533a8d;hpb=f67def9484061c6b6b83ba4ea2e2e1014e078d11;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index e3e978e3..6c9b46c7 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -60,7 +60,7 @@ class SliceView (LoginRequiredAutoLogoutView): 'slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', - #'lease.urn', + 'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' ) @@ -157,6 +157,7 @@ class SliceView (LoginRequiredAutoLogoutView): togglable = False, query = sq_resource, query_all = query_resource_all, + googlemap_api_key = Config().googlemap_api_key(), checkboxes = True, # center on Paris latitude = 49., @@ -192,6 +193,7 @@ class SliceView (LoginRequiredAutoLogoutView): title = 'Scheduler', domid = 'scheduler', query = sq_resource, + query_all_resources = query_resource_all, query_lease = sq_lease, ) @@ -203,11 +205,13 @@ class SliceView (LoginRequiredAutoLogoutView): togglable=True, title="Resources", outline_complete=True, - sons=[ resources_as_gmap, + sons=[ + resources_as_gmap, resources_as_3dmap, resources_as_scheduler, resources_as_list_area, ], active_domid = 'resources-map', + persistent_active=True, ) main_stack.insert (resources_area)