ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/3] ignite git commit: IGNITE-843 Fixed check for already added columns on axes.
Date Tue, 13 Oct 2015 04:21:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 a825dbcd7 -> 105851df2


IGNITE-843 Fixed check for already added columns on axes.


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

Branch: refs/heads/ignite-843-rc1
Commit: cad48074b4813ff159f2cb53131fac04dd0a7307
Parents: aaaf0ae
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Oct 13 11:20:51 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Oct 13 11:20:51 2015 +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/cad48074/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 3b28883..18737f0 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
@@ -69,7 +69,7 @@ consoleModule.controller('sqlController',
     };
 
     $scope.chartAcceptKeyColumn = function(paragraph, item) {
-        var accepted = !_.includes(paragraph.chartKeyCols, item);
+        var accepted = _.findIndex(paragraph.chartKeyCols, item) < 0;
 
         if (accepted) {
             paragraph.chartKeyCols = [item];
@@ -81,7 +81,7 @@ consoleModule.controller('sqlController',
     };
 
     $scope.chartAcceptValColumn = function(paragraph, item) {
-        var accepted = !_.includes(paragraph.chartValCols, item) && item != TIME_LINE
&& _numberType(item.type);
+        var accepted = _.findIndex(paragraph.chartValCols, item) < 0 && item !=
TIME_LINE && _numberType(item.type);
 
         if (accepted) {
             paragraph.chartValCols.push(item);


Mime
View raw message