jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix race for mailConfig in settings view

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-09 13:58:11 +01:00
parent e3ea2323c5
commit 2a86216a4a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/views/settings.js
View File

@@ -301,7 +301,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
refresh: function () {
$scope.email.refreshBusy = true;
getExpectedDnsRecords(function (error) {
showExpectedDnsRecords(function (error) {
if (error) console.error(error);
$scope.email.refreshBusy = false;
@@ -426,6 +426,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
if (error) return console.error(error);
$scope.mailConfig = mailConfig;
showExpectedDnsRecords();
});
}
@@ -445,13 +447,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
});
}
function getExpectedDnsRecords(callback) {
function showExpectedDnsRecords(callback) {
callback = callback || function (error) { if (error) console.error(error); };
// nothing to check if mail is not enabled
if (!$scope.mailConfig.enabled) return;
Client.getExpectedDnsRecords(function (error, dnsRecords) {
Client.showExpectedDnsRecords(function (error, dnsRecords) {
if (error) return callback(error);
$scope.expectedDnsRecords = dnsRecords;
@@ -558,7 +560,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
getMailConfig();
getBackupConfig();
getDnsConfig();
getExpectedDnsRecords();
if ($scope.config.provider === 'caas') {
getPlans();