Allow email to be enabled without dns setup

This helps in importing existing mail and also configuring mailboxes
before going live
This commit is contained in:
Girish Ramakrishnan
2019-05-09 15:40:48 -07:00
parent 05d37cc6c6
commit 7df0ae0ba3
2 changed files with 46 additions and 16 deletions

View File

@@ -189,6 +189,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
$scope.incomingEmail = {
busy: false,
setupDns: true,
setupDnsBusy: false,
toggleEmailEnabled: function () {
if ($scope.selectedDomain.mailConfig.enabled) {
@@ -198,6 +200,18 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
}
},
setDnsRecords: function (callback) {
$scope.incomingEmail.setupDnsBusy = true;
Client.setDnsRecords($scope.selectedDomain.domain, function (error) {
if (error) console.error(error);
$timeout(function () { $scope.incomingEmail.setupDnsBusy = false; }, 2000); // otherwise, it's too fast
if (callback) callback();
});
},
enable: function () {
$('#enableEmailModal').modal('hide');
@@ -208,7 +222,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
$scope.reconfigureEmailApps();
Client.setDnsRecords($scope.selectedDomain.domain, function (error) {
let maybeSetupDns = $scope.incomingEmail.setupDns ? $scope.incomingEmail.setDnsRecords : function (next) { next(); };
maybeSetupDns(function (error) {
if (error) return console.error(error);
$scope.refreshDomain();