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 2015/09/11 04:58:34 UTC
[1/2] ignite git commit: # GG-843 Fixed sql ui for refesh.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 2bf0e311f -> 473390380
# GG-843 Fixed sql ui for refesh.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa728406
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa728406
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa728406
Branch: refs/heads/ignite-843
Commit: aa728406639114823ac48d3730a5ff7ed3380705
Parents: b629d57
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 09:58:56 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 09:58:56 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 20 +++++++++++++++-----
.../src/main/js/views/sql/notebook-new.jade | 2 +-
.../src/main/js/views/sql/paragraph-rate.jade | 2 +-
3 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa728406/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 5786a0f..a713fc0 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
@@ -295,6 +295,19 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
paragraph.columnFilter = _columnFilter(paragraph);
};
+ var _selectAxis = function (cols, col) {
+ if (col) {
+ idx = _.findIndex(cols, function (col) {
+ return col.label == col.label;
+ });
+
+ if (idx >= 0)
+ return col;
+ }
+
+ return cols.length > 0 ? cols[0] : null;
+ };
+
var _processQueryResult = function (paragraph) {
return function (res) {
paragraph.meta = [];
@@ -317,11 +330,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
paragraph.chartColumns.push(col);
});
- paragraph.chartColX = paragraph.chartColumns.length > 0 &&
- paragraph.chartColumns.indexOf(paragraph.chartColX) == -1 ? paragraph.chartColumns[0] : null;
-
- paragraph.chartColY = paragraph.chartColumns.length > 1 &&
- paragraph.chartColumns.indexOf(paragraph.chartColY) == -1 ? paragraph.chartColumns[1] : null;
+ paragraph.chartColX = _selectAxis(paragraph.chartColumns, paragraph.chartColX);
+ paragraph.chartColY = _selectAxis(paragraph.chartColumns, paragraph.chartColY);
}
paragraph.page = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa728406/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
index 3be3d0b..c0f2d54 100644
--- a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
+++ b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade
@@ -25,7 +25,7 @@
.col-sm-9.login.col-sm-offset-1
label.required.labelFormField Name:
.col-sm-9
- input.form-control(id='create-notebook' type='text' ng-model='name' required auto-focus)
+ input.form-control(id='create-notebook' type='text' ng-model='name' required on-enter='ui.inputForm.$valid && createNewNotebook(name)' auto-focus)
.modal-footer
button.btn.btn-default(id='copy-btn-cancel' type='button' ng-click='$hide()') Cancel
button.btn.btn-primary(id='copy-btn-confirm' type='button' ng-disabled='ui.inputForm.$invalid' ng-click='createNewNotebook(name)') Create
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa728406/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
index f79f12b..91411a0 100644
--- a/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
+++ b/modules/control-center-web/src/main/js/views/sql/paragraph-rate.jade
@@ -27,5 +27,5 @@
button.form-control(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' data-container='false' tabindex='0')
.form-actions(style='margin-top: 30px; padding: 5px')
button.btn.btn-primary(id='paragraph-rate-start' ng-disabled='popoverForm.$invalid' type='button' ng-click='startRefresh(paragraph, value, unit); $hide()') Start
- button.btn.btn-primary.btn-default(id='paragraph-rate-stop' type='button' ng-click='stopRefresh(paragraph); $hide()') Stop
+ button.btn.btn-primary.btn-default(id='paragraph-rate-stop' type='button' ng-click='stopRefresh(paragraph); $hide()' ng-disabled='!paragraph.rate.installed') Stop
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47339038
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47339038
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47339038
Branch: refs/heads/ignite-843
Commit: 4733903804cb045255d51733cfe483c76b57d1de
Parents: aa72840 2bf0e31
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 11 09:59:19 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 11 09:59:19 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------