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 CCA2A188CC for ; Fri, 4 Mar 2016 10:03:36 +0000 (UTC) Received: (qmail 12914 invoked by uid 500); 4 Mar 2016 10:03:36 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 12881 invoked by uid 500); 4 Mar 2016 10:03:36 -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 12814 invoked by uid 99); 4 Mar 2016 10:03:36 -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; Fri, 04 Mar 2016 10:03:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 428E0E0A4E; Fri, 4 Mar 2016 10:03:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mahongbin@apache.org To: commits@kylin.apache.org Date: Fri, 04 Mar 2016 10:03:38 -0000 Message-Id: In-Reply-To: <0b811febd8de4b738eb696cc93170cbc@git.apache.org> References: <0b811febd8de4b738eb696cc93170cbc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] kylin git commit: KYLIN-1383 remove deploy.env from front end, for permission control only depend on acl.defaultRole and acl.adminRole in kylin.properties KYLIN-1383 remove deploy.env from front end, for permission control only depend on acl.defaultRole and acl.adminRole in kylin.properties Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4ee5f6ca Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4ee5f6ca Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4ee5f6ca Branch: refs/heads/1.x-HBase1.1.3 Commit: 4ee5f6caf0e27815f0ea0f327672d299d34db383 Parents: e6b38ea Author: Jason Authored: Thu Mar 3 14:34:17 2016 +0800 Committer: Jason Committed: Thu Mar 3 14:34:17 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/services/kylinProperties.js | 1 + webapp/app/partials/cubes/cubes.html | 2 +- webapp/app/partials/jobs/jobs.html | 2 +- webapp/app/partials/projects/projects.html | 2 +- webapp/app/partials/query/query.html | 2 +- webapp/app/partials/tables/source_metadata.html | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/js/services/kylinProperties.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js index e48496b..42e111a 100644 --- a/webapp/app/js/services/kylinProperties.js +++ b/webapp/app/js/services/kylinProperties.js @@ -56,6 +56,7 @@ KylinApp.service('kylinConfig', function (AdminService, $log) { return false; } + //deprecated this.getDeployEnv = function () { this.deployEnv = this.getProperty("deploy.env"); if (!this.deployEnv) { http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/partials/cubes/cubes.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 74fba5c..dc86585 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -31,7 +31,7 @@ - + http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/partials/jobs/jobs.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index aba9ce6..d2e1381 100644 --- a/webapp/app/partials/jobs/jobs.html +++ b/webapp/app/partials/jobs/jobs.html @@ -31,7 +31,7 @@ - + http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/partials/projects/projects.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/projects/projects.html b/webapp/app/partials/projects/projects.html index 26a2037..96e4a91 100644 --- a/webapp/app/partials/projects/projects.html +++ b/webapp/app/partials/projects/projects.html @@ -17,7 +17,7 @@ -->
- +
http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/partials/query/query.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html index 0fe8ea5..b670a69 100644 --- a/webapp/app/partials/query/query.html +++ b/webapp/app/partials/query/query.html @@ -30,7 +30,7 @@ - +
http://git-wip-us.apache.org/repos/asf/kylin/blob/4ee5f6ca/webapp/app/partials/tables/source_metadata.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html index 73c7b3c..e6c71c7 100755 --- a/webapp/app/partials/tables/source_metadata.html +++ b/webapp/app/partials/tables/source_metadata.html @@ -30,7 +30,7 @@ - +