You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2018/01/21 12:02:13 UTC
[03/13] kylin git commit: minor, fix cubeplanner toggle
minor, fix cubeplanner toggle
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/18673d09
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/18673d09
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/18673d09
Branch: refs/heads/KYLIN-2881-review
Commit: 18673d096d57df217bdaf4c9f93759dbf122d68f
Parents: 91c76dd
Author: lidongsjtu <li...@apache.org>
Authored: Tue Jan 9 20:03:16 2018 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Jan 9 20:03:16 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/common/KylinConfigBase.java | 7 ++++++-
webapp/app/js/controllers/page.js | 3 ++-
webapp/app/partials/header.html | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/18673d09/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index ef9b7ab..341ca3f 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -1462,12 +1462,17 @@ abstract public class KylinConfigBase implements Serializable {
return Boolean.parseBoolean(getOptional("kylin.web.export-allow-other", "true"));
}
+ public boolean isWebDashboardEnabled() {
+ return Boolean.parseBoolean(getOptional("kylin.web.dashboard-enabled", "false"));
+ }
+
public String getPropertiesWhiteList() {
return getOptional("kylin.web.properties.whitelist",
"kylin.web.timezone,kylin.query.cache-enabled,kylin.env,kylin.web.hive-limit,kylin.storage.default,kylin.engine.default,kylin.web.link-hadoop,kylin.web.link-diagnostic,"
+ "kylin.web.contact-mail,kylin.web.help.length,kylin.web.help.0,kylin.web.help.1,kylin.web.help.2,kylin.web.help.3,"
+ "kylin.web.help,kylin.web.hide-measures,kylin.web.link-streaming-guide,kylin.server.external-acl-provider,kylin.security.profile,"
- + "kylin.htrace.show-gui-trace-toggle,kylin.web.export-allow-admin,kylin.web.export-allow-other");
+ + "kylin.htrace.show-gui-trace-toggle,kylin.web.export-allow-admin,kylin.web.export-allow-other,"
+ + "kylin.cube.cubeplanner.enabled,kylin.web.dashboard-enabled");
}
// ============================================================================
http://git-wip-us.apache.org/repos/asf/kylin/blob/18673d09/webapp/app/js/controllers/page.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 4636e65..04a5317 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -24,7 +24,8 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $modal, $lo
kylinConfig.init().$promise.then(function (data) {
$log.debug(data);
kylinConfig.initWebConfigInfo();
- $rootScope.isShowCubeplanner = kylinConfig.getProperty('kylin.cube.cubeplanner.enabled') === 'true'
+ $rootScope.isShowCubeplanner = kylinConfig.getProperty('kylin.cube.cubeplanner.enabled') === 'true';
+ $rootScope.isShowDashboard = kylinConfig.getProperty('kylin.web.dashboard-enabled') === 'true'
});
$rootScope.userAction = {
'islogout': false
http://git-wip-us.apache.org/repos/asf/kylin/blob/18673d09/webapp/app/partials/header.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/header.html b/webapp/app/partials/header.html
index 9f1a7e6..32ba591 100644
--- a/webapp/app/partials/header.html
+++ b/webapp/app/partials/header.html
@@ -53,7 +53,7 @@
<li class="{{activeTab=='admin'?'purple':'green'}}" ng-if="userService.hasRole('ROLE_ADMIN')">
<a href="admin">System</a>
</li>
- <li class="{{activeTab=='dashboard'?'purple':'green'}}" ng-if="userService.isAuthorized() && isShowCubeplanner">
+ <li class="{{activeTab=='dashboard'?'purple':'green'}}" ng-if="userService.isAuthorized() && isShowDashboard">
<a href="dashboard">Dashboard</a>
</li>
</ul>