Repository: ignite Updated Branches: refs/heads/ignite-843 857852f89 -> 49409da5a
ignite-843 Fixed chart columns Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49409da5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49409da5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49409da5 Branch: refs/heads/ignite-843 Commit: 49409da5a2f429a0091ccf1fb1a42ba04184bbba Parents: 857852f Author: Andrey <[email protected]> Authored: Thu Oct 8 12:24:11 2015 +0700 Committer: Andrey <[email protected]> Committed: Thu Oct 8 12:24:11 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/49409da5/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 1ae649d..2176208 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 @@ -381,13 +381,13 @@ consoleModule.controller('sqlController', } }); - if (paragraph.chartColumns.length > 0) - paragraph.chartColumns.push({value: -1, label: TIME_LINE}); - paragraph.gridOptions.api.setColumnDefs(columnDefs); paragraph.chartKeyCols = _retainColumns(paragraph.chartColumns, paragraph.chartKeyCols, 0); paragraph.chartValCols = _retainColumns(paragraph.chartColumns, paragraph.chartValCols, 1); + + if (paragraph.chartColumns.length > 0) + paragraph.chartColumns.push({value: -1, label: TIME_LINE}); }; $scope.toggleSystemColumns = function (paragraph) { @@ -398,6 +398,8 @@ consoleModule.controller('sqlController', paragraph.columnFilter = _columnFilter(paragraph); + paragraph.chartColumns = []; + _rebuildColumns(paragraph); setTimeout(function () {
