X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Fstatic%2Fjs%2Fscheduler2.js;h=0b294b472596bfe615320ae8f2f1fe5607a8eaac;hb=48e00b353a2b34629914232082af547b6a2a9d1e;hp=b8c761aadde61d6fdf51a4f17071bf9475e2c55c;hpb=af5885eb6b24505d4979de9d580a1e13e297bde8;p=myslice.git

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index b8c761aa..0b294b47 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -595,15 +595,20 @@ var SCHEDULER_COLWIDTH = 50;
 
             _scope_set_leases: function()
             {
+                    var status;
                 var self = this;
                 var scope = this._get_scope();
             
                 manifold.query_store.iter_records(this.options.query_lease_uuid, function(lease_key, lease) {
-
                     console.log("SET LEASES", lease.resource, new Date(lease.start_time* 1000), new Date(lease.end_time* 1000));
                     // XXX We should ensure leases are correctly merged, otherwise our algorithm won't work
 
                     // Populate leases by resource array: this will help us merging leases later
+
+                    // let's only put _our_ leases
+                    lease_status = manifold.query_store.get_record_state(self.options.query_lease_uuid, lease_key, STATE_SET);
+                    if (lease_status != STATE_SET_IN)
+                        return true; // ~continue
                     if (!(lease.resource in scope._leases_by_resource))
                         scope._leases_by_resource[lease.resource] = [];
                     scope._leases_by_resource[lease.resource].push(lease);
@@ -741,11 +746,11 @@ var SCHEDULER_COLWIDTH = 50;
                             lease_success = '';
                             break;
                         case STATE_SET_OUT_SUCCESS:
-                            lease_class = 'reserved'; // other leases
+                            lease_class = 'free'; // other leases
                             lease_success = 'success';
                             break;
                         case STATE_SET_IN_FAILURE:
-                            lease_class = 'reserved'; // other leases
+                            lease_class = 'free'; // other leases
                             lease_success = 'failure';
                             break;
                         case STATE_SET_IN_PENDING:
@@ -798,7 +803,7 @@ var SCHEDULER_COLWIDTH = 50;
                     SchedulerDateSelected = new Date(ev.date);
                     SchedulerDateSelected.setHours(0,0,0,0);
                     // Set slider to origin
-                    $('#tblSlider').slider('setValue', 0); // XXX
+                    //$('#tblSlider').slider('setValue', 0); // XXX
                     // Refresh leases
                     self._scope_clear_leases();
                     self._set_all_lease_slots();