Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 af6f65db7 -> 0f43514a4
# ignite-843 WIP. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f43514a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f43514a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f43514a Branch: refs/heads/ignite-843 Commit: 0f43514a440769b954dec8cdc96b25ad67397e6b Parents: af6f65d Author: Andrey <anovi...@gridgain.com> Authored: Tue Jun 2 16:57:55 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jun 2 16:57:55 2015 +0700 ---------------------------------------------------------------------- .../public/javascripts/controllers/clusters.js | 27 ++++++++------------ modules/webconfig/nodejs/views/clusters.jade | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f43514a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js index e1083ff..2e6ef74 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js @@ -79,10 +79,10 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }); }; - $scope.removeItem = function(row) { - $http.post('/rest/clusters/remove', {_id: row._id}) - .success(function(data) { - var index = $scope.clusters.indexOf(row); + $scope.removeItem = function(item) { + $http.post('/rest/clusters/remove', {_id: item._id}) + .success(function() { + var index = $scope.clusters.indexOf(item); if (index !== -1) $scope.clusters.splice(index, 1); @@ -93,20 +93,15 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' }; // Save cluster in db. - $scope.saveCluster = function (cluster) { - //console.log(cluster); - - $http.post('/rest/clusters/save', cluster) + $scope.saveItem = function(item) { + $http.post('/rest/clusters/save', item) .success(function() { - for (var i = 0; i < $scope.clusters.length; i++) { - if ($scope.clusters[i]._id == cluster._id) { - console.log($scope.clusters[i]); - - $scope.clusters[i] = angular.copy(cluster); + var cluster = $scope.clusters.find(function(cluster) { + return clusters._id == item._id; + }); - break; - } - } + if (cluster) + angular.extend(cluster, angular.copy(item)); }) .error(function(errorMessage) { console.log('Error: ' + errorMessage); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f43514a/modules/webconfig/nodejs/views/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade index 4edf2d4..b51fa0d 100644 --- a/modules/webconfig/nodejs/views/clusters.jade +++ b/modules/webconfig/nodejs/views/clusters.jade @@ -77,4 +77,4 @@ block content a(ng-click='expanded = true' ng-hide='expanded') Show advanced settings... a(ng-click='expanded = false' ng-show='expanded') Hide advanced settings... center - button.btn.btn-primary(ng-click='saveCluster(backupItem)' ng-disabled='editForm.$invalid') Apply \ No newline at end of file + button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid') Apply \ No newline at end of file
