You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/01/24 06:22:15 UTC

kylin git commit: KYLIN 3182 complete web help configuration [Forced Update!]

Repository: kylin
Updated Branches:
  refs/heads/master fce4c5a3b -> 0ddef025c (forced update)


KYLIN 3182 complete web help configuration


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0ddef025
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0ddef025
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0ddef025

Branch: refs/heads/master
Commit: 0ddef025c6ec51e3758d07f103fe9655335a9d31
Parents: 52479be
Author: chenzhx <ch...@apache.org>
Authored: Wed Jan 24 14:20:06 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Wed Jan 24 14:20:06 2018 +0800

----------------------------------------------------------------------
 core-common/src/main/resources/kylin-defaults.properties | 8 ++++----
 examples/test_case_data/sandbox/kylin.properties         | 8 ++++----
 webapp/app/js/controllers/admin.js                       | 1 -
 webapp/app/js/directives/kylin_abn_tree_directive.js     | 1 -
 4 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/0ddef025/core-common/src/main/resources/kylin-defaults.properties
----------------------------------------------------------------------
diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties
index e87b31d..6510c8b 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -66,10 +66,10 @@ kylin.engine.default=2
 kylin.storage.default=2
 kylin.web.hive-limit=20
 kylin.web.help.length=4
-kylin.web.help.0=start|Getting Started|
-kylin.web.help.1=odbc|ODBC Driver|
-kylin.web.help.2=tableau|Tableau Guide|
-kylin.web.help.3=onboard|Cube Design Tutorial|
+kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs21/tutorial/kylin_sample.html
+kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs21/tutorial/odbc.html
+kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs21/tutorial/tableau_91.html
+kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs21/howto/howto_optimize_cubes.html
 kylin.web.link-streaming-guide=http://kylin.apache.org/
 kylin.htrace.show-gui-trace-toggle=false
 kylin.web.link-hadoop=

http://git-wip-us.apache.org/repos/asf/kylin/blob/0ddef025/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index 13d62a2..3cec94e 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -160,10 +160,10 @@ kylin.security.acl.admin-role=ROLE_ADMIN
 
 # Help info, format{name|displayName|link}, optional
 kylin.web.help.length=4
-kylin.web.help.0=start|Getting Started|
-kylin.web.help.1=odbc|ODBC Driver|
-kylin.web.help.2=tableau|Tableau Guide|
-kylin.web.help.3=onboard|Cube Design Tutorial|
+kylin.web.help.0=start|Getting Started|http://kylin.apache.org/docs21/tutorial/kylin_sample.html
+kylin.web.help.1=odbc|ODBC Driver|http://kylin.apache.org/docs21/tutorial/odbc.html
+kylin.web.help.2=tableau|Tableau Guide|http://kylin.apache.org/docs21/tutorial/tableau_91.html
+kylin.web.help.3=onboard|Cube Design Tutorial|http://kylin.apache.org/docs21/howto/howto_optimize_cubes.html
 
 #allow user to export query result
 kylin.web.export-allow-admin=true

http://git-wip-us.apache.org/repos/asf/kylin/blob/0ddef025/webapp/app/js/controllers/admin.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js
index bbba593..5687824 100644
--- a/webapp/app/js/controllers/admin.js
+++ b/webapp/app/js/controllers/admin.js
@@ -23,7 +23,6 @@ KylinApp.controller('AdminCtrl', function ($scope, AdminService, CacheService, T
   $scope.envStr = "";
 
   $scope.isCacheEnabled = function(){
-    console.log("cache enabled?:"+kylinConfig.isCacheEnabled());
     return kylinConfig.isCacheEnabled();
   }
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/0ddef025/webapp/app/js/directives/kylin_abn_tree_directive.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/kylin_abn_tree_directive.js b/webapp/app/js/directives/kylin_abn_tree_directive.js
index 9466b6a..55b812f 100644
--- a/webapp/app/js/directives/kylin_abn_tree_directive.js
+++ b/webapp/app/js/directives/kylin_abn_tree_directive.js
@@ -290,7 +290,6 @@
             });
           }
           n = scope.treeData.length;
-          console.log('num root branches = ' + n);
           for_each_branch(function(b, level) {
             b.level = level;
             return b.expanded = b.level < expand_level;