git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: removed jquery-ui js+css from base cz it conflicts with sliceresourceview--...
[unfold.git]
/
plugins
/
scheduler
/
__init__.py
diff --git
a/plugins/scheduler/__init__.py
b/plugins/scheduler/__init__.py
index
b44e28e
..
caaaa52
100644
(file)
--- 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
# 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
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"
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",
#"//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",
],
"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):
# 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'
]