kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject kylin git commit: KYLIN-3210 The project shows '_null' in result page.
Date Tue, 30 Jan 2018 09:00:56 GMT
Repository: kylin
Updated Branches:
  refs/heads/master 0f63fa617 -> 4c31b1d4a


KYLIN-3210 The project shows '_null' in result page.

Signed-off-by: chenzhx <chen@apache.org>

KYLIN-3213 Kylin help has duplicate items

Signed-off-by: chenzhx <chen@apache.org>


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

Branch: refs/heads/master
Commit: 4c31b1d4a582522a7a2109bed470d4f65a145c44
Parents: 0f63fa6
Author: xingpeng <xing.peng1@zte.com.cn>
Authored: Mon Jan 29 18:00:14 2018 +0800
Committer: chenzhx <chen@apache.org>
Committed: Tue Jan 30 16:59:42 2018 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/query.js        | 2 +-
 webapp/app/js/services/kylinProperties.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/4c31b1d4/webapp/app/js/controllers/query.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js
index e9ea614..0637000 100644
--- a/webapp/app/js/controllers/query.js
+++ b/webapp/app/js/controllers/query.js
@@ -61,7 +61,7 @@ KylinApp
                 var query = {
                     originSql: sql,
                     sql: sql,
-                    project: (!!project)? project:$scope.projectModel.selectedProject,
+                    project: (!!project)? project:$scope.projectModel.getSelectedProject(),
                     status: 'executing',
                     acceptPartial: true,
                     result: {

http://git-wip-us.apache.org/repos/asf/kylin/blob/4c31b1d4/webapp/app/js/services/kylinProperties.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js
index ec23397..c344866 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -94,6 +94,7 @@ KylinApp.service('kylinConfig', function (AdminService, $log) {
       Config.reference_links.hadoop.link = this.getProperty("kylin.web.link-hadoop").trim();
       Config.reference_links.diagnostic.link = this.getProperty("kylin.web.link-diagnostic").trim();
       Config.contact_mail = this.getProperty("kylin.web.contact-mail").trim();
+      Config.documents = [];
       var doc_length = this.getProperty("kylin.web.help.length").trim();
       for (var i = 0; i < doc_length; i++) {
         var _doc = {};


Mime
View raw message