From 90329b300fb640aa05be04cd34831d219650f0cd Mon Sep 17 00:00:00 2001 From: jiazhong Date: Tue, 23 Dec 2014 14:55:35 +0800 Subject: [PATCH] stop list jobs&cubes when refresh page from pagenation autoload --- webapp/app/js/controllers/cubeEdit.js | 4 ---- webapp/app/js/controllers/cubes.js | 6 +++--- webapp/app/js/controllers/job.js | 5 +++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index bf42f81..8130497 100644 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -520,10 +520,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio if(!newValue){ return; } - if(newValue=="-- Select All --"){ - $scope.project.selectedProject=$scope.project.projects[1]; - return; - } $scope.srcTablesInProject=[]; var param = { ext: true, diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index c7a6f26..8af23fd 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -27,9 +27,9 @@ KylinApp dimensionFilter: '', measureFilter: ''}; $scope.list = function (offset, limit) { -// if(!$scope.project.selectedProject){ -// return; -// } + if(!$scope.project.projects.length){ + return; + } offset = (!!offset) ? offset : 0; limit = (!!limit) ? limit : 20; var defer = $q.defer(); diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index 19da6ae..424f2aa 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -43,6 +43,11 @@ KylinApp }); $scope.list = function (offset, limit) { + + if(!$scope.project.projects.length){ + return; + } + offset = (!!offset) ? offset : 0; var selectedJob = null; if (angular.isDefined($scope.state.selectedJob)) {