From df8e4cc3afdde223b7eea8f5e03982989792aa82 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 9 Dec 2014 12:44:29 +0800
Subject: [PATCH] return emplty when proj is null

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

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index eae1655..3557866 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -27,6 +27,9 @@ KylinApp
             dimensionFilter: '', measureFilter: ''};
 
         $scope.list = function (offset, limit) {
+            if(!$scope.project.selectedProject){
+                return;
+            }
             offset = (!!offset) ? offset : 0;
             limit = (!!limit) ? limit : 20;
             var defer = $q.defer();
@@ -73,7 +76,7 @@ KylinApp
 
         $scope.$watch('project.selectedProject', function (newValue, oldValue) {
             //exclude when refresh page oldValue=null,first time set value for project (will have page auto reload ,incase duplicate) oldvalue is null
-           if(oldValue){
+           if(newValue){
                 $scope.cubes=[];
                 $scope.reload();
            }
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 9790e01..df818cc 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -41,9 +41,9 @@ KylinApp
         });
 
         $scope.list = function (offset, limit) {
-
-
-
+            if(!$scope.project.selectedProject){
+                return;
+            }
             offset = (!!offset) ? offset : 0;
             var selectedJob = null;
             if (angular.isDefined($scope.state.selectedJob)) {
@@ -94,7 +94,7 @@ KylinApp
 
 
         $scope.$watch('project.selectedProject', function (newValue, oldValue) {
-            if(oldValue){
+            if(newValue){
                 $scope.jobs={};
                 $scope.state.projectName = newValue;
                 $scope.reload();