Fix return code for email toggle to let the UI correctly react

This commit is contained in:
Johannes Zellner
2018-01-23 15:35:02 +01:00
parent 7e5afcfe6a
commit a2241a4e47
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -1206,8 +1206,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
Client.prototype.enableMailForDomain = function (domain, enabled, callback) { Client.prototype.enableMailForDomain = function (domain, enabled, callback) {
post('/api/v1/mail/' + domain + '/enable', { enabled: enabled }).success(function (data, status) { post('/api/v1/mail/' + domain + '/enable', { enabled: enabled }).success(function (data, status) {
if (status !== 202 || typeof data !== 'object') return callback(new ClientError(status, data)); if (status !== 202) return callback(new ClientError(status, data));
callback(null, data); callback(null);
}).error(defaultErrorHandler(callback)); }).error(defaultErrorHandler(callback));
}; };
+2 -2
View File
@@ -20,7 +20,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" ng-click="email.enable()">I understand, enable</button> <button type="button" class="btn btn-success" ng-click="enableEmail()">I understand, enable</button>
</div> </div>
</div> </div>
</div> </div>
@@ -96,7 +96,7 @@
<br/> <br/>
<div class="row"> <div class="row">
<div class="col-md-12" ng-show="selectedDomain.provider !== 'caas'"> <div class="col-md-12" ng-show="selectedDomain.provider !== 'caas'">
<button ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button> <button ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="toggleEmailEnabled()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
</div> </div>
<div class="col-md-12" ng-show="selectedDomain.provider === 'caas'"> <div class="col-md-12" ng-show="selectedDomain.provider === 'caas'">
<span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span> <span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span>
+2 -2
View File
@@ -58,9 +58,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
} }
}; };
$scope.toggleEmail = function () { $scope.toggleEmailEnabled = function () {
if ($scope.selectedDomain.mailConfig.enabled) { if ($scope.selectedDomain.mailConfig.enabled) {
$scope.email.disable(); $scope.disableEmail();
$scope.refreshDomain(); $scope.refreshDomain();
return; return;
} }