Updated service directory server url

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

diff --git a/plugins/scheduler2/__init__.py b/plugins/scheduler2/__init__.py
index 220683f..040b274 100755 (executable)
--- a/plugins/scheduler2/__init__.py
+++ b/plugins/scheduler2/__init__.py
@@ -5,13 +5,16 @@ 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, query_all_resources, query_all_leases, **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_all_leases = query_all_leases\r
+        self.query_all_leases_uuid = query_all_leases.query_uuid\r
+\r
         self.query_lease = query_lease\r
         self.query_lease_uuid = query_lease.query_uuid\r
 \r
@@ -32,13 +35,12 @@ class Scheduler2 (Plugin):
     def requirements (self):\r
         reqs = {\r
             'js_files' : [\r
-                # Thierry: I have to move this one step up - was 'js/angular/angular.min.js',\r
-                'js/angular.min.js',\r
+                'js/angular/angular.min.js',\r
                 'js/scheduler2.js',\r
-                'js/SchedulerCtrl.js',\r
+                'js/scheduler-SchedulerCtrl.js',\r
                 #'js/slider/jquery-ui-1.10.3.slider.min.js',\r
                 'js/scheduler-helpers.js',\r
-                'js/table-selector.js',\r
+                'js/scheduler-table-selector.js',\r
             ],\r
             'css_files': [\r
                 'css/scheduler2.css', \r
@@ -52,7 +54,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', 'query_all_resources_uuid', 'query_all_leases_uuid']\r
     \r
 \r
     def export_json_settings (self):\r