X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2F__init__.py;h=040b2740f4fff80a4293729d791a4b53e69f0870;hb=1f8c88845076b4df151b4d193532d17f0ffa4956;hp=220683fcb0ddeb96fb0e9c254cc487c1b98df6a8;hpb=f58ac7b14172fd118809c1e1bede33faebbd1f40;p=myslice.git

diff --git a/plugins/scheduler2/__init__.py b/plugins/scheduler2/__init__.py
index 220683fc..040b2740 100755
--- a/plugins/scheduler2/__init__.py
+++ b/plugins/scheduler2/__init__.py
@@ -5,13 +5,16 @@ from datetime import timedelta
 class Scheduler2 (Plugin):
 
 
-    def __init__ (self, query, query_all_resources, query_lease = None, **settings):
+    def __init__ (self, query, query_lease, query_all_resources, query_all_leases, **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_all_leases = query_all_leases
+        self.query_all_leases_uuid = query_all_leases.query_uuid
+
         self.query_lease = query_lease
         self.query_lease_uuid = query_lease.query_uuid
 
@@ -32,13 +35,12 @@ class Scheduler2 (Plugin):
     def requirements (self):
         reqs = {
             'js_files' : [
-                # Thierry: I have to move this one step up - was 'js/angular/angular.min.js',
-                'js/angular.min.js',
+                'js/angular/angular.min.js',
                 'js/scheduler2.js',
-                'js/SchedulerCtrl.js',
+                'js/scheduler-SchedulerCtrl.js',
                 #'js/slider/jquery-ui-1.10.3.slider.min.js',
                 'js/scheduler-helpers.js',
-                'js/table-selector.js',
+                'js/scheduler-table-selector.js',
             ],
             'css_files': [
                 'css/scheduler2.css', 
@@ -52,7 +54,7 @@ class Scheduler2 (Plugin):
         # query_uuid will pass self.query results to the javascript
         # and will be available as "record" in :
         # on_new_record: function(record)
-        return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid', 'query_all_resources_uuid']
+        return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid', 'query_all_resources_uuid', 'query_all_leases_uuid']
     
 
     def export_json_settings (self):