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/27 11:39:42 UTC
ignite git commit: IGNITE-1715 Reset button.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 302d62f84 -> d8fc3990d
IGNITE-1715 Reset button.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8fc3990
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8fc3990
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8fc3990
Branch: refs/heads/ignite-843-rc1
Commit: d8fc3990d5c775a5e83756e8237b8031bc916dcd
Parents: 302d62f
Author: vsisko <vs...@gridgain.com>
Authored: Tue Oct 27 17:39:45 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 27 17:39:45 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 12 +++++++++++-
.../src/main/js/controllers/clusters-controller.js | 10 ++++++++++
.../src/main/js/controllers/igfs-controller.js | 12 +++++++++++-
.../src/main/js/controllers/metadata-controller.js | 8 +++++++-
.../src/main/js/views/configuration/caches.jade | 4 ++++
.../src/main/js/views/configuration/clusters.jade | 4 ++++
.../src/main/js/views/configuration/igfs.jade | 4 ++++
.../src/main/js/views/configuration/metadata.jade | 4 ++++
8 files changed, 55 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/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 8abe83e..922897e 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
@@ -591,6 +591,16 @@ consoleModule.controller('cachesController', [
$common.resetItem($scope.backupItem, resetTo, $scope.general, group);
$common.resetItem($scope.backupItem, resetTo, $scope.advanced, group);
- }
+ };
+
+ $scope.resetAll = function() {
+ _.forEach($scope.general, function(group) {
+ $scope.resetItem(group.group);
+ });
+
+ _.forEach($scope.advanced, function(group) {
+ $scope.resetItem(group.group);
+ });
+ };
}]
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/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 faece3a..ab6d5fa 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
@@ -588,5 +588,15 @@ consoleModule.controller('clustersController', [
$common.resetItem($scope.backupItem, resetTo, $scope.general, group);
$common.resetItem($scope.backupItem, resetTo, $scope.advanced, group);
};
+
+ $scope.resetAll = function() {
+ _.forEach($scope.general, function(group) {
+ $scope.resetItem(group.group);
+ });
+
+ _.forEach($scope.advanced, function(group) {
+ $scope.resetItem(group.group);
+ });
+ };
}]
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 581d1c8..cea6640 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -380,6 +380,16 @@ consoleModule.controller('igfsController', [
$common.resetItem($scope.backupItem, resetTo, $scope.general, group);
$common.resetItem($scope.backupItem, resetTo, $scope.advanced, group);
- }
+ };
+
+ $scope.resetAll = function() {
+ _.forEach($scope.general, function(group) {
+ $scope.resetItem(group.group);
+ });
+
+ _.forEach($scope.advanced, function(group) {
+ $scope.resetItem(group.group);
+ });
+ };
}]
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/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 437555c..ccab1ea 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
@@ -1293,6 +1293,12 @@ consoleModule.controller('metadataController', [
resetTo = prepareNewItem();
$common.resetItem($scope.backupItem, resetTo, $scope.metadata, group);
- }
+ };
+
+ $scope.resetAll = function() {
+ _.forEach($scope.metadata, function(group) {
+ $scope.resetItem(group.group);
+ });
+ };
}]
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index f2ebed6..1727ba7 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -34,6 +34,8 @@ block content
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cache')
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cache
+save-remove-buttons('cache')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
@@ -44,3 +46,5 @@ block content
+advanced-options
.section(ng-if='ui.expanded')
+save-remove-buttons('cache')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cache' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index b546db6..e57d511 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -34,6 +34,8 @@ block content
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster')
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add cluster
+save-remove-buttons('cluster')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
@@ -44,3 +46,5 @@ block content
+advanced-options
.section(ng-show='ui.expanded')
+save-remove-buttons('cluster')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current cluster' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index 2a99d71..cfee5ee 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -34,6 +34,8 @@ block content
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new IGFS')
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add IGFS
+save-remove-buttons('IGFS')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
@@ -44,3 +46,5 @@ block content
+advanced-options
.section(ng-show='ui.expanded')
+save-remove-buttons('IGFS')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current IGFS' data-placement='bottom' data-trigger='hover') Reset
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8fc3990/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index db297e3..0a15840 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -59,9 +59,13 @@ block content
.panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom')
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset
hr
form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('metadata', 'backupItem')
.section
+save-remove-buttons('metadata')
+ .panel-tip-container(ng-show='backupItem')
+ a.btn.btn-primary(id='reset-item' ng-disabled='!ui.isDirty()' ng-click='resetAll()' bs-tooltip data-title='Reset current metadata' data-placement='bottom' data-trigger='hover') Reset