You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/17 03:49:05 UTC
ignite git commit: IGNITE-843 Fixed chart axis titles in special case.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 79eaee2a1 -> aed8ebeb4
IGNITE-843 Fixed chart axis titles in special case.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aed8ebeb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aed8ebeb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aed8ebeb
Branch: refs/heads/ignite-843-rc1
Commit: aed8ebeb4f23a0744fc8d07072fd33396050bfd3
Parents: 79eaee2
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Nov 17 09:49:25 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 17 09:49:25 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aed8ebeb/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 22e927a..f7e5ce5 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
@@ -563,6 +563,9 @@ consoleModule.controller('sqlController',
var _processQueryResult = function (paragraph, refreshMode) {
return function (res) {
+ var prevKeyCols = paragraph.chartKeyCols;
+ var prevValCols = paragraph.chartValCols;
+
if (res.meta && !refreshMode) {
paragraph.meta = [];
@@ -643,8 +646,20 @@ consoleModule.controller('sqlController',
if (paragraph.result == 'none' || paragraph.queryArgs.type != "QUERY")
paragraph.result = 'table';
- else if (paragraph.chart())
- _chartApplySettings(paragraph, queryChanged);
+ else if (paragraph.chart()) {
+ var resetCharts = queryChanged;
+
+ if (!resetCharts) {
+ var curKeyCols = paragraph.chartKeyCols;
+ var curValCols = paragraph.chartValCols;
+
+ resetCharts = !prevKeyCols || !prevValCols ||
+ prevKeyCols.length != curKeyCols.length ||
+ prevValCols.length != curValCols.length;
+ }
+
+ _chartApplySettings(paragraph, resetCharts);
+ }
}
};