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/10/13 06:21:19 UTC
[1/3] ignite git commit: IGNITE-843 Fixed check for already added
columns on axes.
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 <ak...@apache.org>
Authored: Tue Oct 13 11:20:51 2015 +0700
Committer: Alexey Kuznetsov <ak...@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);
[2/3] ignite git commit: IGNITE-843 Minor message change.
Posted by ak...@apache.org.
IGNITE-843 Minor message change.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4026fe7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4026fe7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4026fe7
Branch: refs/heads/ignite-843-rc1
Commit: d4026fe7af595811b331dcab75a87aae53e46418
Parents: cad4807
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Oct 13 11:21:22 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 13 11:21:22 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d4026fe7/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index de58686..8d5e628 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -151,7 +151,7 @@ block container
.chart-settings-link
i.fa.fa-chevron-circle-down
a(ng-show='paragraph.chart' ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings
- .sql-empty-result Can't display chart. Need configure axis using 
+ .sql-empty-result Cannot display chart. Please configure axis using 
b Chart settings
div(ng-show='paragraph.chartColumnsConfigured()')
div(ng-show='paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()')
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/105851df
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/105851df
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/105851df
Branch: refs/heads/ignite-843-rc1
Commit: 105851df28e8b16b4740305b06c1f3126e6ad1df
Parents: d4026fe a825dbc
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Oct 13 11:21:44 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 13 11:21:44 2015 +0700
----------------------------------------------------------------------
.../main/java/org/apache/ignite/agent/AgentConfiguration.java | 4 ++++
.../src/main/java/org/apache/ignite/agent/AgentLauncher.java | 1 +
.../src/main/java/org/apache/ignite/agent/AgentSocket.java | 5 +++--
.../main/java/org/apache/ignite/agent/remote/RemoteHandler.java | 4 ++++
4 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------