X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler%2F__init__.py;h=caaaa5212c392c5c986f1e6d61fd28e3baf2f7fe;hb=95f9830a64033723460c820d5b50199563d62a8b;hp=b44e28ea03eab55ff053b38556a298ac7d9ae545;hpb=6e13c225bb6e91885b5eb4cb668d59d0ed707830;p=myslice.git

diff --git a/plugins/scheduler/__init__.py b/plugins/scheduler/__init__.py
index b44e28ea..caaaa521 100644
--- a/plugins/scheduler/__init__.py
+++ b/plugins/scheduler/__init__.py
@@ -6,11 +6,13 @@ class Scheduler(Plugin):
     # pass columns as the initial set of columns
     #   if None then this is taken from the query's fields
     # latitude,longitude, zoom : the starting point
-    def __init__ (self, query, query_all = None, **settings):
+    def __init__ (self, query, query_all_resources, query_lease = None, **settings):
         Plugin.__init__ (self, **settings)
         self.query=query
-        self.query_all = query_all
-        self.query_all_uuid = query_all.query_uuid if query_all else None
+        self.query_all_resources = query_all_resources
+        self.query_all_resources_uuid = query_all_resources.query_uuid
+        self.query_lease = query_lease
+        self.query_lease_uuid = query_lease.query_uuid if query_lease else None
 
     def template_file (self):
         return "scheduler.html"
@@ -25,7 +27,7 @@ class Scheduler(Plugin):
                            #"//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js",
                             "js/raphael.js",
                             "js/manifold.js", "js/manifold-query.js", 
-                            "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", 
+                            "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", 
                             "js/unfold-helper.js",
                             "js/jquery-ui-timepicker-addon.js", "js/jquery-ui-sliderAccess.js",
                            ],
@@ -37,4 +39,4 @@ class Scheduler(Plugin):
 
     # the list of things passed to the js plugin
     def json_settings_list (self): 
-        return ['plugin_uuid','query_uuid', 'query_all_uuid', ]
+        return ['plugin_uuid','query_uuid', 'query_lease_uuid', 'query_all_resources_uuid']