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 2016/03/04 10:30:57 UTC

[02/50] ignite git commit: IGNITE-843 Fixed pie chart display.

IGNITE-843 Fixed pie chart display.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a0d870f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a0d870f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a0d870f

Branch: refs/heads/ignite-843
Commit: 2a0d870fe747bc1c14cd7077b6d18ea22f543794
Parents: 99eaa65
Author: vsisko <vs...@gridgain.com>
Authored: Thu Feb 18 11:13:37 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Feb 18 11:13:37 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/controllers/sql-controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2a0d870f/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 fa2605e..a7abc82 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
@@ -1123,7 +1123,7 @@ consoleModule.controller('sqlController', function ($http, $timeout, $interval,
 
                     var v = {
                         x: xCol < 0 ? index : row[xCol],
-                        y: _chartNumber(row, valCol, index)
+                        y: _chartNumber(row, valCol.value, index)
                     };
 
                     index++;
@@ -1131,7 +1131,7 @@ consoleModule.controller('sqlController', function ($http, $timeout, $interval,
                     return v;
                 });
 
-                datum.push({series: valCol.label, key: valCol.label, values: values});
+                datum.push({series: paragraph.chartKeyCols[0].label, key: valCol.label, values: values});
             });
         }