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 Removed quote from string in table
Date Wed, 07 Oct 2015 02:55:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 86fe3afa1 -> 03b3b4f8e


ignite-843 Removed quote from string in table


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

Branch: refs/heads/ignite-843
Commit: 03b3b4f8ee05964595156cf52af9615a30047ff8
Parents: 86fe3af
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Oct 7 09:55:49 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Oct 7 09:55:49 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/03b3b4f8/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 b9ad846..ffa8e98 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
@@ -361,11 +361,11 @@ consoleModule.controller('sqlController',
                 paragraph.chartColumns.push({value: idx, label: meta.fieldName});
 
                 // Index for explain, execute and fieldName for scan.
-                var colName = paragraph.queryArgs.query ? idx : '"' + meta.fieldName + '"';
+                var colValue = 'data[' +  (paragraph.queryArgs.query ? idx : '"' + meta.fieldName
+ '"') + ']';
 
                 columnDefs.push({
                     headerName: meta.fieldName,
-                    valueGetter: 'JSON.stringify(data[' +  colName + '])'
+                    valueGetter: meta.fieldTypeName == 'java.lang.String' ? colValue : 'JSON.stringify('
+ colValue + ')'
                 });
             }
         });
@@ -450,7 +450,7 @@ consoleModule.controller('sqlController',
                 paragraph.rows = [];
 
                 res.rows.forEach(function (row) {
-                    (row[0] + '\n ').replace(/\"/g, '').split('\n').forEach(function (line)
{
+                    (row[0]).replace(/\"/g, '').split('\n').forEach(function (line) {
                         paragraph.rows.push([line]);
                     });
                 });


Mime
View raw message