ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: ignite-843 Fixed chart columns
Date Thu, 08 Oct 2015 05:04:54 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 97d72ce94 -> 857852f89


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/857852f8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/857852f8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/857852f8

Branch: refs/heads/ignite-843
Commit: 857852f897c433c89c14d4a837fd76ee7102c6c7
Parents: 97d72ce
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Oct 8 12:04:47 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Oct 8 12:04:47 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/857852f8/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 17a25bd..1ae649d 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
@@ -429,16 +429,17 @@ consoleModule.controller('sqlController',
 
     var _processQueryResult = function (paragraph, refreshMode) {
         return function (res) {
-            paragraph.meta = [];
-            paragraph.chartColumns = [];
+            if (res.meta && !refreshMode) {
+                paragraph.meta = [];
 
-            if (!$common.isDefined(paragraph.chartKeyCols))
-                paragraph.chartKeyCols = [];
+                paragraph.chartColumns = [];
 
-            if (!$common.isDefined(paragraph.chartValCols ))
-                paragraph.chartValCols = [];
+                if (!$common.isDefined(paragraph.chartKeyCols))
+                    paragraph.chartKeyCols = [];
+
+                if (!$common.isDefined(paragraph.chartValCols ))
+                    paragraph.chartValCols = [];
 
-            if (res.meta && !refreshMode) {
                 paragraph.disabledSystemColumns = res.meta.length == 2 &&
                     _.find(res.meta, {fieldName: '_KEY'}) && _.find(res.meta, {fieldName:
'_VAL'});
 


Mime
View raw message