fixed duplicated leases

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 862b8a7..fbfcfa0 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -313,7 +313,7 @@ var SCHEDULER_COLWIDTH = 50;
                     }\r
         \r
                     $scope._create_new_lease(model_resource.urn, start_time, end_time);\r
-                    model_lease.status = (model_lease.status == 'free') ? 'pendingin' : 'in';\r
+                    model_lease.status = (model_lease.status == 'free') ? 'pendingin' : 'selected';\r
                     // unless the exact same lease already existed (pending_out status for the lease, not the cell !!)\r
 \r
                     break;\r
@@ -599,8 +599,17 @@ var SCHEDULER_COLWIDTH = 50;
                         scope._leases_by_resource[lease.resource] = [];\r
                     scope._leases_by_resource[lease.resource].push(lease);\r
 \r
-                    self._set_lease_slots(lease_key, lease);\r
+                });\r
 \r
+                this._set_all_lease_slots();\r
+            },\r
+\r
+            _set_all_lease_slots: function()\r
+            {\r
+                var self = this;\r
+            \r
+                manifold.query_store.iter_records(this.options.query_lease_uuid, function(lease_key, lease) {\r
+                    self._set_lease_slots(lease_key, lease);\r
                 });\r
             },\r
 \r
@@ -780,7 +789,7 @@ var SCHEDULER_COLWIDTH = 50;
                     $('#tblSlider').slider('setValue', 0); // XXX\r
                     // Refresh leases\r
                     self._scope_clear_leases();\r
-                    self._scope_set_leases();\r
+                    self._set_all_lease_slots();\r
                     // Refresh display\r
                     self._get_scope().$apply();\r
                 }).datepicker('setValue', SchedulerDateSelected); //.data('datepicker');\r