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/09/11 18:32:35 UTC
[1/2] ignite git commit: IGNITE-843 Fixed refresh charts.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 efe9ae9d0 -> 9f1934e44
IGNITE-843 Fixed refresh charts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7983586b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7983586b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7983586b
Branch: refs/heads/ignite-843
Commit: 7983586bebddc00100ed27158d6c2516e382ea3e
Parents: efe9ae9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Sep 11 23:32:00 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Sep 11 23:32:00 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/controllers/sql-controller.js | 4 ++++
modules/control-center-web/src/main/js/views/sql/sql.jade | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7983586b/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 eb12530..3750f2e 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
@@ -348,6 +348,10 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
};
var _executeRefresh = function (paragraph) {
+ // TODO IGNITE-843 Temporary disable charts refresh by timer
+ if (paragraph.rate.installed && paragraph.chart())
+ return;
+
$http.post('/agent/query', paragraph.queryArgs)
.success(_processQueryResult(paragraph))
.error(function (errMsg) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7983586b/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 8d3db3d..dda1c43 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
@@ -102,8 +102,8 @@ 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:
- a.btn.btn-default.fa.fa-columns.tipLabel(ng-class='{"btn-info": paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
+ labelHide System columns:
+ a.btn.btn-default.fa.fa-bars.tipLabel(ng-class='{"btn-info": !paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
label.tipLabel 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:
[2/2] ignite git commit: IGNITE-843 Fixed dirty/pristine state logic.
Posted by ak...@apache.org.
IGNITE-843 Fixed dirty/pristine state logic.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f1934e4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f1934e4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f1934e4
Branch: refs/heads/ignite-843
Commit: 9f1934e44256770a6daa3197f1e39461228013a0
Parents: 7983586
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Sep 11 23:32:31 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Sep 11 23:32:31 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 4 ++++
.../src/main/js/controllers/clusters-controller.js | 4 ++++
.../control-center-web/src/main/js/controllers/common-module.js | 4 ++++
.../src/main/js/controllers/metadata-controller.js | 2 ++
4 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f1934e4/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 2ca56a2..55ab8cb 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -267,6 +267,10 @@ controlCenterModule.controller('cachesController', [
else
selectFirstItem();
+ $timeout(function() {
+ $scope.ui.markPristineHard();
+ });
+
$scope.$watch('backupItem', function (val) {
if (val) {
var metas = cacheMetadatas(val);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f1934e4/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 6007531..0009069 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -189,6 +189,10 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
else
selectFirstItem();
+ $timeout(function() {
+ $scope.ui.markPristineHard();
+ });
+
$scope.$watch('backupItem', function (val) {
if (val) {
var clusterCaches = _.reduce($scope.caches, function(caches, cache){
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f1934e4/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 296f7e3..f5db503 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
@@ -770,6 +770,10 @@ controlCenterModule.service('$common', [
markPristine(this.inputForm);
}
},
+ markPristineHard: function() {
+ if (isDefined(this.inputForm))
+ markPristine(this.inputForm);
+ },
markPristine: function (dirtyCnt) {
this.dirty = dirtyCnt;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f1934e4/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index d9cadbb..c63c2fe 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -599,6 +599,8 @@ controlCenterModule.controller('metadataController', [
$timeout(function () {
$scope.$apply();
+
+ $scope.ui.markPristineHard();
});
$scope.$watch('backupItem', function (val) {