Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 e5bfc4c7f -> 2cb3d9caf
IGNITE-843 Deep merge of objects. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cb3d9ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cb3d9ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cb3d9ca Branch: refs/heads/ignite-843-rc2 Commit: 2cb3d9cafee6cb17dd0057f688923a513beee890 Parents: e5bfc4c Author: Vasiliy Sisko <[email protected]> Authored: Mon Feb 15 18:17:13 2016 +0700 Committer: Andrey <[email protected]> Committed: Mon Feb 15 18:17:13 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/clusters-controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2cb3d9ca/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 f07c91d..8f44788 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 @@ -192,7 +192,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope else $scope.backupItem = undefined; - $scope.backupItem = angular.extend({}, blank, $scope.backupItem); + $scope.backupItem = angular.merge({}, blank, $scope.backupItem); __original_value = JSON.stringify($cleanup($scope.backupItem)); @@ -218,7 +218,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope } }; - newItem = angular.extend({}, blank, newItem); + newItem = angular.merge({}, blank, newItem); newItem.caches = id && _.find($scope.caches, {value: id}) ? [id] : []; newItem.igfss = id && _.find($scope.igfss, {value: id}) ? [id] : []; @@ -424,7 +424,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope }); if (idx >= 0) - angular.extend($scope.clusters[idx], item); + angular.merge($scope.clusters[idx], item); else { item._id = _id; $scope.clusters.push(item);
