diff --git a/src/views/users.js b/src/views/users.js index f71fb44f9..b7b0c9b6e 100644 --- a/src/views/users.js +++ b/src/views/users.js @@ -35,27 +35,33 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.userremove.error.password = null; $scope.userremove.busy = true; - Client.removeUser($scope.userremove.userInfo.id, $scope.userremove.password, function (error) { - $scope.userremove.busy = false; + // transfer to self for now. not transferred to owner because this user probably wants to "manage" it immediately + // FIXME: this may awkwardly transfer resources but fail with incorrect password + Client.transferOwnership($scope.userremove.userInfo.id, $scope.userInfo.id, function (error) { + if (error) return console.error('Unable to transfer resources.', error); - if (error && error.statusCode === 403) { - $scope.userremove.error.password = 'Wrong password'; + Client.removeUser($scope.userremove.userInfo.id, $scope.userremove.password, function (error) { + $scope.userremove.busy = false; + + if (error && error.statusCode === 403) { + $scope.userremove.error.password = 'Wrong password'; + $scope.userremove.password = ''; + $scope.userremove_form.password.$setPristine(); + $('#inputUserRemovePassword').focus(); + return; + } + if (error) return console.error('Unable to delete user.', error); + + $scope.userremove.userInfo = {}; $scope.userremove.password = ''; - $scope.userremove_form.password.$setPristine(); - $('#inputUserRemovePassword').focus(); - return; - } - if (error) return console.error('Unable to delete user.', error); - $scope.userremove.userInfo = {}; - $scope.userremove.password = ''; + $scope.userremove_form.$setPristine(); + $scope.userremove_form.$setUntouched(); - $scope.userremove_form.$setPristine(); - $scope.userremove_form.$setUntouched(); + refresh(); - refresh(); - - $('#userRemoveModal').modal('hide'); + $('#userRemoveModal').modal('hide'); + }); }); } };