From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 29 Nov 2013 10:22:02 +0000 (+0100)
Subject: global flag for turning off leases in sliceview
X-Git-Tag: myslice-0.3-0~98
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fcd452b931fcc40fd82807d2c0affdd0d951d9e3

global flag for turning off leases in sliceview
---

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 8c6f9fe3..0c32b401 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -31,6 +31,9 @@ tmp_default_slice='ple.upmc.myslicedemo'
 #do_query_users=True
 do_query_users=False
 
+#do_query_leases=True
+do_query_leases=False
+
 insert_messages=False
 #insert_messages=True
 
@@ -43,6 +46,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         page.add_js_files  ( [ "js/common.functions.js" ] )
         page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
         page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+        page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
         config=Config()
         page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
         page.expose_js_metadata()
@@ -193,28 +197,36 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        resources_as_scheduler = Scheduler(
-            page        = page,
-            title       = 'Scheduler',
-            domid       = 'scheduler',
-            query       = sq_resource,
-            query_all_resources = query_resource_all,
-            query_lease = sq_lease,
-        )
+        if do_query_leases:
+            resources_as_scheduler = Scheduler(
+                page        = page,
+                title       = 'Scheduler',
+                domid       = 'scheduler',
+                query       = sq_resource,
+                query_all_resources = query_resource_all,
+                query_lease = sq_lease,
+                )
 
        # with the new 'Filter' stuff on top, no need for anything but the querytable
         resources_as_list_area = resources_as_list 
 
+        resources_sons = [
+            resources_as_gmap, 
+            resources_as_3dmap,
+            resources_as_scheduler,
+            resources_as_list_area,
+            ] if do_query_leases else [
+            resources_as_gmap, 
+            resources_as_3dmap,
+            resources_as_list_area,
+            ]
+
         resources_area = Tabs ( page=page, 
                                 domid="resources",
                                 togglable=True,
                                 title="Resources",
                                 outline_complete=True,
-                                sons=[ 
-                                       resources_as_gmap, 
-                                       resources_as_3dmap,
-                                       resources_as_scheduler,
-                                       resources_as_list_area, ],
+                                sons= resources_sons,
                                 active_domid = 'resources-map',
                                 persistent_active=True,
                                 )