X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler%2F__init__.py;h=caaaa5212c392c5c986f1e6d61fd28e3baf2f7fe;hb=2870580fcaad4c3f1a2b9fa75499dcd4f7297449;hp=3a7771f48e9084812c39bbe37b346f339146406d;hpb=365e932c846dcd93f35f4cae9a04be0f7056d0a5;p=myslice.git diff --git a/plugins/scheduler/__init__.py b/plugins/scheduler/__init__.py index 3a7771f4..caaaa521 100644 --- a/plugins/scheduler/__init__.py +++ b/plugins/scheduler/__init__.py @@ -6,9 +6,11 @@ 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_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 @@ -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_lease_uuid', ] + return ['plugin_uuid','query_uuid', 'query_lease_uuid', 'query_all_resources_uuid']