X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=6c9b46c7d942c594fef38fa830b28e15c2e85605;hb=f4201a3e21c8623dbe74f707b1841e8c912f573b;hp=60415a4fc9bc408811e5dbdd5c9139dccb46cee5;hpb=8e47d1e76551223a1997d9383ac0bb987e04dfad;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 60415a4f..6c9b46c7 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -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, ) @@ -204,11 +206,12 @@ class SliceView (LoginRequiredAutoLogoutView): title="Resources", outline_complete=True, sons=[ + resources_as_gmap, + resources_as_3dmap, resources_as_scheduler, - #resources_as_gmap, - #resources_as_3dmap, resources_as_list_area, ], active_domid = 'resources-map', + persistent_active=True, ) main_stack.insert (resources_area)