From afb7817ab5b69f5855a8984959d81afb9aee471a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Sun, 13 Jul 2014 12:07:40 +0200 Subject: [PATCH] fixed duplicated leases --- plugins/scheduler2/static/js/scheduler2.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js index 862b8a7b..fbfcfa00 100755 --- a/plugins/scheduler2/static/js/scheduler2.js +++ b/plugins/scheduler2/static/js/scheduler2.js @@ -313,7 +313,7 @@ var SCHEDULER_COLWIDTH = 50; } $scope._create_new_lease(model_resource.urn, start_time, end_time); - model_lease.status = (model_lease.status == 'free') ? 'pendingin' : 'in'; + model_lease.status = (model_lease.status == 'free') ? 'pendingin' : 'selected'; // unless the exact same lease already existed (pending_out status for the lease, not the cell !!) break; @@ -599,8 +599,17 @@ var SCHEDULER_COLWIDTH = 50; scope._leases_by_resource[lease.resource] = []; scope._leases_by_resource[lease.resource].push(lease); - self._set_lease_slots(lease_key, lease); + }); + this._set_all_lease_slots(); + }, + + _set_all_lease_slots: function() + { + var self = this; + + manifold.query_store.iter_records(this.options.query_lease_uuid, function(lease_key, lease) { + self._set_lease_slots(lease_key, lease); }); }, @@ -780,7 +789,7 @@ var SCHEDULER_COLWIDTH = 50; $('#tblSlider').slider('setValue', 0); // XXX // Refresh leases self._scope_clear_leases(); - self._scope_set_leases(); + self._set_all_lease_slots(); // Refresh display self._get_scope().$apply(); }).datepicker('setValue', SchedulerDateSelected); //.data('datepicker'); -- 2.43.0