X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Fstatic%2Fjs%2Fscheduler-SchedulerCtrl.js;h=90288ab418ac53f3e2a0bd7ebbd403dac5cff42e;hb=dd0ce5dc4178b5af7101b997a078070bee6fb988;hp=510514479d17d455055267c587bf2273df2a5447;hpb=bee9637a5524fcc30ec45debe417d176041f1813;p=unfold.git

diff --git a/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js b/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
index 51051447..90288ab4 100755
--- a/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
+++ b/plugins/scheduler2/static/js/scheduler-SchedulerCtrl.js
@@ -54,8 +54,7 @@ myApp.factory('$exceptionHandler', function () {
             $scope.resources = new Array();
 
             for (var k = 0; k < pageSize; k++) {
-                if ($scope.resources.length < SchedulerDataViewData.length)
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
                 $scope.resources[k].leases = [];
             }
             $scope.pageSize = pageSize;
@@ -67,12 +66,12 @@ myApp.factory('$exceptionHandler', function () {
         $scope.setPage = function(page) {
             var tmpFrm = $scope.pageSize * page;
             var tmpTo = tmpFrm + $scope.pageSize;
+            tmpTo = SchedulerDataViewData.length < tmpTo ? SchedulerDataViewData.length : tmpTo;
             $scope.curPage = page;
             $scope.resources = [];
             var j = 0;
             for (var k = tmpFrm; k < tmpTo; k++) {
-                if ($scope.resources.length < SchedulerDataViewData.length)
-                    $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
+                $scope.resources.push(jQuery.extend(true, {}, SchedulerDataViewData[k]));
                 $scope.resources[j].leases = [];
                 j++;
             }
@@ -134,7 +133,7 @@ myApp.factory('$exceptionHandler', function () {
         };
 
         $scope.getPageNumbers = function () {
-            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages );
+            var totalNumbersShowned = ($scope.totalPages > 10 ? 10 : $scope.totalPages + 1 );
             var tmtNumDiv = totalNumbersShowned / 2;
             //local
             var numFrom = 1;