Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4F741200C63 for ; Thu, 11 May 2017 17:46:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4E017160BC7; Thu, 11 May 2017 15:46:04 +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 95F55160BB2 for ; Thu, 11 May 2017 17:46:03 +0200 (CEST) Received: (qmail 39285 invoked by uid 500); 11 May 2017 15:46:02 -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 39276 invoked by uid 99); 11 May 2017 15:46:02 -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; Thu, 11 May 2017 15:46:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADBEFDFD70; Thu, 11 May 2017 15:46:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: billyliu@apache.org To: commits@kylin.apache.org Message-Id: <2c9faceeed294becae2452181d3df33e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: KYLIN-2595 Result query should use alias name to replace dimension column name when used Keyword As Date: Thu, 11 May 2017 15:46:02 +0000 (UTC) archived-at: Thu, 11 May 2017 15:46:04 -0000 Repository: kylin Updated Branches: refs/heads/master c6428efae -> 397642009 KYLIN-2595 Result query should use alias name to replace dimension column name when used Keyword As Signed-off-by: Billy Liu Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/39764200 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/39764200 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/39764200 Branch: refs/heads/master Commit: 397642009ed6056d7ee5ee66f51f7f67026933d4 Parents: c6428ef Author: wuyingjun Authored: Thu May 11 23:17:09 2017 +0800 Committer: Billy Liu Committed: Thu May 11 23:45:45 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/query.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/39764200/webapp/app/js/controllers/query.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index 6be915b..945ddef 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -185,14 +185,14 @@ KylinApp angular.forEach(result.results, function (row, index) { var oneRow = {}; angular.forEach(result.columnMetas, function (meta, metaIndex) { - oneRow[meta.name] = row[metaIndex]; + oneRow[meta.label] = row[metaIndex]; }); data.push(oneRow); }); var columnDefs = []; angular.forEach(result.columnMetas, function (meta, metaIndex) { - columnDefs.push({field: meta.name, width: 120}); + columnDefs.push({field: meta.label, width: 120}); }); if (oneQuery.result.results) {