Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FA9B18F13 for ; Mon, 14 Dec 2015 06:21:52 +0000 (UTC) Received: (qmail 98721 invoked by uid 500); 14 Dec 2015 06:21:52 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 98694 invoked by uid 500); 14 Dec 2015 06:21:52 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 98685 invoked by uid 99); 14 Dec 2015 06:21:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2015 06:21:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 722B1DFFD8; Mon, 14 Dec 2015 06:21:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhongjian@apache.org To: commits@kylin.apache.org Message-Id: <9d779d1fe1734d939d7ce40d7c4e0cdf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: KYLIN-1225 fix cubes page list issue Date: Mon, 14 Dec 2015 06:21:52 +0000 (UTC) Repository: kylin Updated Branches: refs/heads/2.x-staging b331bf13e -> aaaf82cdb KYLIN-1225 fix cubes page list issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/aaaf82cd Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/aaaf82cd Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/aaaf82cd Branch: refs/heads/2.x-staging Commit: aaaf82cdb8f820422c58627aff1822400cb2e6e1 Parents: b331bf1 Author: jian Authored: Mon Dec 14 14:21:36 2015 +0800 Committer: jian Committed: Mon Dec 14 14:21:36 2015 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubes.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/aaaf82cd/webapp/app/js/controllers/cubes.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 843ad7a..528adb2 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -72,11 +72,12 @@ KylinApp item.kfkConfig = kfkConfig; } }) - $scope.loading = false; - defer.resolve(resp); - return defer.promise; }) + $scope.loading = false; + defer.resolve(resp); + return defer.promise; + },function(resp){ $scope.loading = false; defer.resolve([]);