From commits-return-17880-archive-asf-public=cust-asf.ponee.io@kylin.apache.org Tue Jan 30 10:00:58 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 6E64A18061A for ; Tue, 30 Jan 2018 10:00:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E84E160C53; Tue, 30 Jan 2018 09:00:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A627B160C42 for ; Tue, 30 Jan 2018 10:00:57 +0100 (CET) Received: (qmail 87008 invoked by uid 500); 30 Jan 2018 09:00:56 -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 86999 invoked by uid 99); 30 Jan 2018 09:00:56 -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; Tue, 30 Jan 2018 09:00:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BDF74E04AA; Tue, 30 Jan 2018 09:00:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chen@apache.org To: commits@kylin.apache.org Message-Id: <13393b13e076476d88841ca0e8173118@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: KYLIN-3210 The project shows '_null' in result page. Date: Tue, 30 Jan 2018 09:00:56 +0000 (UTC) Repository: kylin Updated Branches: refs/heads/master 0f63fa617 -> 4c31b1d4a KYLIN-3210 The project shows '_null' in result page. Signed-off-by: chenzhx KYLIN-3213 Kylin help has duplicate items Signed-off-by: chenzhx 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 Authored: Mon Jan 29 18:00:14 2018 +0800 Committer: chenzhx 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 = {};