Repository: ignite Updated Branches: refs/heads/ignite-843-rc3 528204254 -> c8932348b
IGNITE-2599 Do not show unsaved changes dialog on clone. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18d18a60 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18d18a60 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18d18a60 Branch: refs/heads/ignite-843-rc3 Commit: 18d18a60a92a967e42db300346f2601dc1b00407 Parents: 5282042 Author: Andrey <[email protected]> Authored: Wed Feb 10 09:30:50 2016 +0700 Committer: Andrey <[email protected]> Committed: Wed Feb 10 09:30:50 2016 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 20 ++++++++------------ .../main/js/controllers/clusters-controller.js | 18 +++++++----------- .../main/js/controllers/domains-controller.js | 20 ++++++++------------ .../src/main/js/controllers/igfs-controller.js | 18 +++++++----------- 4 files changed, 30 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/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 006704c..c1837c8 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 @@ -621,22 +621,18 @@ consoleModule.controller('cachesController', [ // Save cache with new name. $scope.cloneItem = function () { - function cloneItem() { - if ($scope.tableReset(true) && validate($scope.backupItem)) { - $clone.confirm($scope.backupItem.name, _cacheNames()).then(function (newName) { - var item = angular.copy($scope.backupItem); + if ($scope.tableReset(true) && validate($scope.backupItem)) { + $clone.confirm($scope.backupItem.name, _cacheNames()).then(function (newName) { + var item = angular.copy($scope.backupItem); - delete item._id; - delete item.demo; + delete item._id; + delete item.demo; - item.name = newName; + item.name = newName; - save(item); - }); - } + save(item); + }); } - - $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem); }; // Remove cache from db. http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/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 a893a42..465f7aa 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 @@ -447,20 +447,16 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope // Copy cluster with new name. $scope.cloneItem = function () { - function cloneItem() { - if (validate($scope.backupItem)) { - $clone.confirm($scope.backupItem.name, _clusterNames()).then(function (newName) { - var item = angular.copy($scope.backupItem); + if (validate($scope.backupItem)) { + $clone.confirm($scope.backupItem.name, _clusterNames()).then(function (newName) { + var item = angular.copy($scope.backupItem); - delete item._id; - item.name = newName; + delete item._id; + item.name = newName; - save(item); - }); - } + save(item); + }); } - - $common.confirmUnsavedChanges($scope.backupItem && $scope.ui.inputForm.$dirty, cloneItem); }; // Remove cluster from db. http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/modules/control-center-web/src/main/js/controllers/domains-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js index a6624bf..96ee87d 100644 --- a/modules/control-center-web/src/main/js/controllers/domains-controller.js +++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js @@ -1380,21 +1380,17 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout // Save domain model with new name. $scope.cloneItem = function () { - function cloneItem() { - if ($scope.tableReset(true) && validate($scope.backupItem)) { - $clone.confirm($scope.backupItem.valueType, _domainNames()).then(function (newName) { - var item = angular.copy($scope.backupItem); + if ($scope.tableReset(true) && validate($scope.backupItem)) { + $clone.confirm($scope.backupItem.valueType, _domainNames()).then(function (newName) { + var item = angular.copy($scope.backupItem); - delete item._id; - delete item.demo; - item.valueType = newName; + delete item._id; + delete item.demo; + item.valueType = newName; - save(item); - }); - } + save(item); + }); } - - $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem); }; // Remove domain model from db. http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/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 0af5fc2..4644c3d 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 @@ -359,20 +359,16 @@ consoleModule.controller('igfsController', [ // Save IGFS with new name. $scope.cloneItem = function () { - function cloneItem() { - if ($scope.tableReset(true) && validate($scope.backupItem)) { - $clone.confirm($scope.backupItem.name).then(function (newName) { - var item = angular.copy($scope.backupItem); + if ($scope.tableReset(true) && validate($scope.backupItem)) { + $clone.confirm($scope.backupItem.name).then(function (newName) { + var item = angular.copy($scope.backupItem); - delete item._id; - item.name = newName; + delete item._id; + item.name = newName; - save(item); - }); - } + save(item); + }); } - - $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem); }; // Remove IGFS from db.
