Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A24CA179BE for ; Fri, 25 Sep 2015 04:09:01 +0000 (UTC) Received: (qmail 95095 invoked by uid 500); 25 Sep 2015 04:09:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 95060 invoked by uid 500); 25 Sep 2015 04:09:01 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 95045 invoked by uid 99); 25 Sep 2015 04:09:01 -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; Fri, 25 Sep 2015 04:09:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 436CADFD86; Fri, 25 Sep 2015 04:09:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Fri, 25 Sep 2015 04:09:01 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: IGNITE-843 Fixed hide system columns. Repository: ignite Updated Branches: refs/heads/ignite-843 31cda5a6e -> 3f29a19a7 IGNITE-843 Fixed hide system columns. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9bba7b1b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9bba7b1b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9bba7b1b Branch: refs/heads/ignite-843 Commit: 9bba7b1b691ebae6dda46632d02a173e62e20b4b Parents: e6991b8 Author: Andrey Authored: Fri Sep 25 11:09:00 2015 +0700 Committer: Andrey Committed: Fri Sep 25 11:09:00 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 36 ++++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9bba7b1b/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 42f0f85..3574aeb 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -329,6 +329,23 @@ controlCenterModule.controller('sqlController', paragraph.systemColumns = !paragraph.systemColumns; paragraph.columnFilter = _columnFilter(paragraph); + + var columnDefs = []; + + _.forEach(paragraph.meta, function (meta, idx) { + if (paragraph.columnFilter(meta)) { + columnDefs.push({ + headerName: meta.fieldName, + valueGetter: 'JSON.stringify(data[' + idx + '])' + }); + } + }); + + paragraph.gridOptions.api.setColumnDefs(columnDefs); + + setTimeout(function () { + paragraph.gridOptions.api.sizeColumnsToFit(); + }, 1); }; function _retainColumns(allCols, curCols, dfltIdx) { @@ -374,18 +391,15 @@ controlCenterModule.controller('sqlController', var columnDefs = []; - var idx = 0; - - _.forEach(res.meta, function (meta) { - columnDefs.push({ - headerName: meta.fieldName, - valueGetter: 'JSON.stringify(data[' + idx + '])' - }); - - var col = {value: idx++, label: meta.fieldName}; + _.forEach(res.meta, function (meta, idx) { + if (paragraph.columnFilter(meta)) { + paragraph.chartColumns.push({value: idx + 1, label: meta.fieldName}); - if (paragraph.disabledSystemColumns || _hideColumn(meta)) - paragraph.chartColumns.push(col); + columnDefs.push({ + headerName: meta.fieldName, + valueGetter: 'JSON.stringify(data[' + (idx) + '])' + }); + } }); paragraph.gridOptions.api.setColumnDefs(columnDefs);