Merge branch 'master' into scheduler

[myslice.git] / portal / sliceview.py

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 60415a4..42cc8ba 100644 (file)
--- 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,
         )
 
@@ -209,6 +211,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                                        #resources_as_3dmap,
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
+                                persistent_active=True,
                                 )
         main_stack.insert (resources_area)