diff --git a/src/js/client.js b/src/js/client.js index 9a6ae8c4c..d7980914c 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -1697,10 +1697,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }); }; - Client.prototype.removeMailDomain = function (domain, password, callback) { + Client.prototype.removeMailDomain = function (domain, callback) { var config = { data: { - password: password }, headers: { 'Content-Type': 'application/json' @@ -1725,17 +1724,16 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }); }; - Client.prototype.removeDomain = function (domain, password, callback) { + Client.prototype.removeDomain = function (domain, callback) { var config = { data: { - password: password }, headers: { 'Content-Type': 'application/json' } }; - this.removeMailDomain(domain, password, function () { + this.removeMailDomain(domain, function () { // hack: ignore errors until we fix the domains.js del('/api/v1/domains/' + domain, config, function (error, data, status) { if (error) return callback(error); diff --git a/src/views/domains.html b/src/views/domains.html index 5af56b1e5..88df19d48 100644 --- a/src/views/domains.html +++ b/src/views/domains.html @@ -187,24 +187,11 @@ diff --git a/src/views/domains.js b/src/views/domains.js index 740efc122..c07b64d46 100644 --- a/src/views/domains.js +++ b/src/views/domains.js @@ -378,7 +378,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat busy: false, error: null, domain: null, - password: '', show: function (domain) { $scope.domainRemove.reset(); @@ -392,12 +391,9 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat $scope.domainRemove.busy = true; $scope.domainRemove.error = null; - Client.removeDomain($scope.domainRemove.domain.domain, $scope.domainRemove.password, function (error) { + Client.removeDomain($scope.domainRemove.domain.domain, function (error) { if (error && (error.statusCode === 403 || error.statusCode === 409)) { - $scope.domainRemove.password = ''; $scope.domainRemove.error = error.message; - $scope.domainRemoveForm.password.$setPristine(); - $('#domainRemovePasswordInput').focus(); } else if (error) { Client.error(error); } else { @@ -415,10 +411,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat $scope.domainRemove.busy = false; $scope.domainRemove.error = null; $scope.domainRemove.domain = null; - $scope.domainRemove.password = ''; - - $scope.domainRemoveForm.$setPristine(); - $scope.domainRemoveForm.$setUntouched(); } };