From: Chrysostomos Kolovos <xrklvs@gmail.com>
Date: Tue, 20 May 2014 10:03:11 +0000 (+0300)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~99
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=01d1627a2fd12829d9d7608ce3c65e260e42e50a;hp=9c22e578ac9d3e3d544fe87191790915620bef26;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/plugins/scheduler2/static/js/scheduler-helpers.js b/plugins/scheduler2/static/js/scheduler-helpers.js
index c55c6356..383cf1cf 100755
--- a/plugins/scheduler2/static/js/scheduler-helpers.js
+++ b/plugins/scheduler2/static/js/scheduler-helpers.js
@@ -148,7 +148,7 @@ function _schedulerSetStatusSlot(slotId, rowIndex, resourceIndex, classText) {
     for (var s = 0; s < maxg; s++) {
         if (tmpVS.groupIndex != s) {
             SchedulerDataViewData[rowIndex].leases[startSlotId].status = classText;
-            SchedulerData[rowIndex].leases[startSlotId].status = classText;
+            SchedulerData[resourceIndex].leases[startSlotId].status = classText;
         }
         startSlotId++;
     }
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index e1c6f3f0..27300e33 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -345,6 +345,7 @@ var tmpSchedulerLeases = [];
                     for (var i = 0; i < SchedulerData.length; i++)
                     {
                         var tpmR = SchedulerData[i];
+                        //for capturing start and end of the lease
                         var newLeaseStarted = false;
                         for (var j = 0; j < tpmR.leases.length; j++) {
                             var tpmL = tpmR.leases[j];