From 4c708be39aa40db56b041d95d2d4e5fa361e4975 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 23 Dec 2014 16:50:58 +0800
Subject: [PATCH 1/2] rollback reload method

---
 webapp/app/js/controllers/cubes.js     |  2 +-
 webapp/app/js/controllers/job.js       |  2 +-
 webapp/app/js/directives/directives.js | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 8af23fd..a92b48c 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -28,7 +28,7 @@ KylinApp
 
         $scope.list = function (offset, limit) {
             if(!$scope.project.projects.length){
-                return;
+                return [];
             }
             offset = (!!offset) ? offset : 0;
             limit = (!!limit) ? limit : 20;
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 424f2aa..c7feaa6 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -45,7 +45,7 @@ KylinApp
         $scope.list = function (offset, limit) {
 
             if(!$scope.project.projects.length){
-                return;
+                return [];
             }
 
             offset = (!!offset) ? offset : 0;
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index 264cb05..8055b6b 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -47,12 +47,14 @@ KylinApp.directive('kylinPagination', function ($parse, $q) {
 
             scope.reload = function () {
                 var length = scope.getLength(scope.data);
-                scope.loadFunc(0, scope.limit).then(function (dataLength) {
-                    scope.data = $parse(attrs.data)(scope.$parent);
-                    scope.hasMore = dataLength == scope.limit;
-
-                    return scope.data;
-                });
+                var _resp = scope.loadFunc(0, scope.limit);
+                if(_resp.length){
+                    scope.loadFunc(0, scope.limit).then(function (dataLength) {
+                        scope.data = $parse(attrs.data)(scope.$parent);
+                        scope.hasMore = dataLength == scope.limit;
+                        return scope.data;
+                    });
+                }
             }
 
             if (scope.autoLoad) {

From 61dc6c269aee2a3e9d5471cc274b238a36da8717 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 23 Dec 2014 17:05:49 +0800
Subject: [PATCH 2/2] rm code in reload

---
 webapp/app/js/controllers/cubes.js | 6 ------
 webapp/app/js/controllers/job.js   | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index d0ccd5d..1edad8c 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -38,11 +38,7 @@ KylinApp
             if ($scope.listParams.cubeName) {
                 queryParam.cubeName = $scope.listParams.cubeName;
             }
-//            if ($scope.project.selectedProject){
                queryParam.projectName = $scope.project.selectedProject;
-//            }else{
-//                queryParam.projectName = $scope.project.projects[0];
-//            }
 
             $scope.loading = true;
             CubeService.list(queryParam, function (cubes) {
@@ -83,9 +79,7 @@ KylinApp
         });
         $scope.reload = function () {
             // trigger reload action in pagination directive
-            if($scope.action.reload==undefined){
                 $scope.action.reload = false;
-            }
             $scope.action.reload = !$scope.action.reload;
         };
 
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 211dc21..f076b21 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -91,9 +91,6 @@ KylinApp
 
         $scope.reload = function () {
             // trigger reload action in pagination directive
-            if($scope.action.reload==undefined){
-                $scope.action.reload = false;
-            }
             $scope.action.reload = !$scope.action.reload;
         };