major updates to slice reservation page and plugins

[myslice.git] / plugins / scheduler2 / __init__.py

diff --git a/plugins/scheduler2/__init__.py b/plugins/scheduler2/__init__.py
index a1057a4..abe8eea 100755 (executable)
--- a/plugins/scheduler2/__init__.py
+++ b/plugins/scheduler2/__init__.py
@@ -5,14 +5,15 @@ from datetime import timedelta
 class Scheduler2 (Plugin):\r
 \r
 \r
-    def __init__ (self, query, query_all_resources, query_lease = None, **settings):\r
+    def __init__ (self, query, query_lease, **settings):\r
         Plugin.__init__ (self, **settings)\r
         \r
         self.query=query\r
-        self.query_all_resources = query_all_resources\r
-        self.query_all_resources_uuid = query_all_resources.query_uuid\r
+\r
         self.query_lease = query_lease\r
-        query_lease.query_uuid if query_lease else None\r
+        self.query_lease_uuid = query_lease.query_uuid\r
+\r
+        #query_lease.query_uuid if query_lease else None\r
 \r
         #granularity in minutes\r
         granularity = 10\r
@@ -30,13 +31,12 @@ class Scheduler2 (Plugin):
         reqs = {\r
             'js_files' : [\r
                 'js/scheduler2.js',\r
-                'js/slider/jquery-ui-1.10.3.slider.min.js',\r
+                #'js/slider/jquery-ui-1.10.3.slider.min.js',\r
                 'js/scheduler-helpers.js',\r
-                'js/table-selector.js',\r
             ],\r
             'css_files': [\r
                 'css/scheduler2.css', \r
-                'css/slider/jquery-ui-1.10.3.slider.min.css', \r
+                #'css/slider/jquery-ui-1.10.3.slider.min.css', \r
             ]\r
         }\r
         return reqs\r
@@ -46,7 +46,7 @@ class Scheduler2 (Plugin):
         # query_uuid will pass self.query results to the javascript\r
         # and will be available as "record" in :\r
         # on_new_record: function(record)\r
-        return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid', 'query_all_resources_uuid']\r
+        return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid']\r
     \r
 \r
     def export_json_settings (self):\r