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/10 12:18:54 UTC
[1/2] ignite git commit: # GG-843 Updated agent version, sql.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 a7e40a638 -> 375e412e8
# GG-843 Updated agent version, sql.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/894b403d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/894b403d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/894b403d
Branch: refs/heads/ignite-843
Commit: 894b403d517685864263fe9b06304437bf179433
Parents: e35c4fb
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 10 17:19:29 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 10 17:19:29 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/controllers/sql-controller.js | 21 ++++++++++++++------
.../src/main/js/views/sql/sql.jade | 5 ++---
3 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/894b403d/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index c8e676b..2232088 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1627,7 +1627,7 @@ controlCenterModule.controller('agent-download', [
var lnk = document.createElement('a');
- lnk.setAttribute('href', '/agent/ignite-web-agent-1.5.0-SNAPSHOT.zip');
+ lnk.setAttribute('href', '/agent/ignite-web-agent-1.4.0-SNAPSHOT.zip');
lnk.style.display = 'none';
document.body.appendChild(lnk);
http://git-wip-us.apache.org/repos/asf/ignite/blob/894b403d/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 0f9ec31..c5b3aee 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
@@ -27,7 +27,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
$scope.caches = [];
- $scope.pageSizes = [10, 25, 50, 100];
+ $scope.pageSizes = [50, 100, 200, 400, 800, 1000];
$scope.modes = [
{value: 'PARTITIONED', label: 'PARTITIONED'},
@@ -268,7 +268,9 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
.success(function (nodes) {
$scope.caches = [];
- nodes[0].caches.map(function (cache) {
+ var caches = _.sortBy(nodes[0].caches, 'name');
+
+ caches.map(function (cache) {
$scope.caches.push({
"name" : cache.name,
meta: [
@@ -287,8 +289,14 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
});
- $scope.applySystemColumns = function (paragraph) {
- paragraph.columnFilter = !paragraph.disabledSystemColumns && paragraph.hideSystemColumns ? _hideColumn : _allColumn;
+ var _columnFilter = function(paragraph) {
+ return !paragraph.disabledSystemColumns && paragraph.hideSystemColumns ? _hideColumn : _allColumn;
+ };
+
+ $scope.toggleSystemColumns = function (paragraph) {
+ paragraph.hideSystemColumns = !paragraph.hideSystemColumns;
+
+ paragraph.columnFilter = _columnFilter(paragraph);
};
var _processQueryResult = function (paragraph) {
@@ -300,7 +308,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
paragraph.disabledSystemColumns = res.meta.length == 2 &&
res.meta[0].fieldName === "_KEY" && res.meta[1].fieldName === "_VAL";
- $scope.applySystemColumns(paragraph);
+ paragraph.columnFilter = _columnFilter(paragraph);
paragraph.meta = res.meta;
@@ -327,7 +335,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
paragraph.rows = res.rows;
- paragraph.result = 'table';
+ if (paragraph.result = 'none')
+ paragraph.result = 'table';
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/894b403d/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 34c3b15..dcd9797 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
@@ -101,13 +101,12 @@ block container
a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, true)' ng-click='actionAvailable(paragraph, true) ? execute(paragraph) : ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "execute", true)}}') Execute
a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom' bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
.pull-right
+ labelHide Hide system columns:
+ button.btn.btn-default.fa.fa-columns.tipLabel(ng-class='{active: paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
label Refresh rate:
button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='rate' data-placement='left' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
label.tipLabel Page size:
button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize' bs-options='item for item in pageSizes' bs-select style='margin-right: 0')
- label(style='margin-left: 10px')
- input(type='checkbox' ng-model='paragraph.hideSystemColumns' ng-click='applySystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
- | Hide system columns
.col-sm-12(ng-show='paragraph.errMsg')
hr(style='margin-top: 0; margin-bottom: 10px')
.sql-error-result(ng-show='paragraph.errMsg') Error: {{paragraph.errMsg}}
[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/375e412e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/375e412e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/375e412e
Branch: refs/heads/ignite-843
Commit: 375e412e83d3379b161b30a87b42b53f243c1bd6
Parents: 894b403 a7e40a6
Author: Andrey <an...@gridgain.com>
Authored: Thu Sep 10 17:19:46 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Sep 10 17:19:46 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 32 ++++++-------
.../main/js/controllers/clusters-controller.js | 48 ++++++++++----------
.../src/main/js/controllers/common-module.js | 3 +-
.../main/js/controllers/metadata-controller.js | 12 ++---
.../src/main/js/controllers/sql-controller.js | 6 +--
.../src/main/js/public/stylesheets/style.scss | 2 +
.../main/js/routes/generator/generator-java.js | 4 +-
.../main/js/routes/generator/generator-xml.js | 6 ++-
.../src/main/js/views/sql/sql.jade | 2 +-
9 files changed, 59 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/375e412e/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/375e412e/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/375e412e/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------