ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-1715 Reset button.
Date Wed, 28 Oct 2015 02:55:55 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 d8fc3990d -> 0d8c5e311


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/0d8c5e31
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d8c5e31
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d8c5e31

Branch: refs/heads/ignite-843-rc1
Commit: 0d8c5e311defc826752cd7f8719651cf6c16b26d
Parents: d8fc399
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Oct 28 09:55:59 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Oct 28 09:55:59 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/caches-controller.js         | 11 ++++-------
 .../src/main/js/controllers/clusters-controller.js       | 11 ++++-------
 .../src/main/js/controllers/igfs-controller.js           | 11 ++++-------
 .../src/main/js/controllers/metadata-controller.js       |  7 ++++---
 4 files changed, 16 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0d8c5e31/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 922897e..57dfe3a 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
@@ -594,13 +594,10 @@ consoleModule.controller('cachesController', [
             };
 
             $scope.resetAll = function() {
-                _.forEach($scope.general, function(group) {
-                    $scope.resetItem(group.group);
-                });
-
-                _.forEach($scope.advanced, function(group) {
-                    $scope.resetItem(group.group);
-                });
+                $confirm.confirm('Are you sure you want to reset current cache?')
+                    .then(function() {
+                        $scope.backupItem = $scope.selectedItem ? angular.copy($scope.selectedItem)
: prepareNewItem();
+                    });
             };
         }]
 );

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d8c5e31/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 ab6d5fa..50320d6 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
@@ -590,13 +590,10 @@ consoleModule.controller('clustersController', [
         };
 
         $scope.resetAll = function() {
-            _.forEach($scope.general, function(group) {
-                $scope.resetItem(group.group);
-            });
-
-            _.forEach($scope.advanced, function(group) {
-                $scope.resetItem(group.group);
-            });
+            $confirm.confirm('Are you sure you want to reset current cluster?')
+                .then(function() {
+                    $scope.backupItem = $scope.selectedItem ? angular.copy($scope.selectedItem)
: prepareNewItem();
+                });
         };
     }]
 );

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d8c5e31/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 cea6640..b57fb28 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
@@ -383,13 +383,10 @@ consoleModule.controller('igfsController', [
             };
 
             $scope.resetAll = function() {
-                _.forEach($scope.general, function(group) {
-                    $scope.resetItem(group.group);
-                });
-
-                _.forEach($scope.advanced, function(group) {
-                    $scope.resetItem(group.group);
-                });
+                $confirm.confirm('Are you sure you want to reset current IGFS?')
+                    .then(function() {
+                        $scope.backupItem = $scope.selectedItem ? angular.copy($scope.selectedItem)
: prepareNewItem();
+                    });
             };
         }]
 );

http://git-wip-us.apache.org/repos/asf/ignite/blob/0d8c5e31/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 ccab1ea..9a70c1d 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
@@ -1296,9 +1296,10 @@ consoleModule.controller('metadataController', [
             };
 
             $scope.resetAll = function() {
-                _.forEach($scope.metadata, function(group) {
-                    $scope.resetItem(group.group);
-                });
+                $confirm.confirm('Are you sure you want to reset current metadata?')
+                    .then(function() {
+                        $scope.backupItem = $scope.selectedItem ? angular.copy($scope.selectedItem)
: prepareNewItem();
+                    });
             };
         }]
 );


Mime
View raw message