You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/25 08:59:33 UTC
[2/4] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
# Conflicts:
# modules/control-center-web/src/main/js/controllers/sql-controller.js
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed78aab7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed78aab7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed78aab7
Branch: refs/heads/ignite-843
Commit: ed78aab770da786e1ad5df6f90c861ba44e23111
Parents: 54ad06d b29d017
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 25 13:17:12 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 25 13:27:26 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 6 ++----
.../src/main/js/views/sql/chart-settings.jade | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed78aab7/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --cc modules/control-center-web/src/main/js/controllers/sql-controller.js
index ba3f8f5,83ec8a3..26da4ce
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@@ -322,16 -322,21 +322,16 @@@ controlCenterModule.controller('sqlCont
return paragraph.disabledSystemColumns || paragraph.systemColumns ? _allColumn : _hideColumn;
};
- $scope.toggleSystemColumns = function (paragraph) {
- if (paragraph.disabledSystemColumns)
- return;
-
- paragraph.systemColumns = !paragraph.systemColumns;
-
- paragraph.columnFilter = _columnFilter(paragraph);
-
+ var _rebuildColumns = function (paragraph) {
var columnDefs = [];
- _.forEach(res.meta, function (meta, idx) {
+ _.forEach(paragraph.meta, function (meta, idx) {
if (paragraph.columnFilter(meta)) {
+ paragraph.chartColumns.push({value: idx + 1, label: meta.fieldName});
+
columnDefs.push({
headerName: meta.fieldName,
- valueGetter: 'JSON.stringify(data[' + idx + '])'
+ valueGetter: 'JSON.stringify(data[' + (idx) + '])'
});
}
});