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

Only allow email to be enabled if a real dns provider is setup

Browse Source
This commit is contained in:
Johannes
2016-10-25 16:31:22 +02:00
parent fc09cf2205
commit 25243970ad
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/views/settings.html
View File

@@ -261,11 +261,11 @@
</div>
<br/>
<div class="row">
<p class="col-md-12" ng-show="!config.isCustomDomain && !config.isDev">
<b>Email can only be enabled for custom domains.</b>
<p class="col-md-12" ng-show="!config.isDev && (dnsConfig.provider === 'noop' || dnsConfig.provider === 'caas')">
<b>Email can only be enabled for custom domains with a DNS provider setup.</b>
</p>
<div class="col-md-12" ng-show="config.isCustomDomain || config.isDev">
<div class="col-md-12" ng-show="config.isDev || !(dnsConfig.provider === 'noop' || dnsConfig.provider === 'caas')">
<button ng-class="mailConfig.enabled ? 'btn btn-danger pull-right' : 'btn btn-primary pull-right'" ng-click="toggleEmail()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
</div>
</div>

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

@@ -7,6 +7,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.user = Client.getUserInfo();
$scope.config = Client.getConfig();
$scope.backupConfig = {};
$scope.dnsConfig = {};
$scope.appstoreConfig = {};
$scope.mailConfig = null;
@@ -364,6 +365,14 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
});
}
function getDnsConfig() {
Client.getDnsConfig(function (error, dnsConfig) {
if (error) return console.error(error);
$scope.dnsConfig = dnsConfig;
});
}
$scope.toggleEmail = function () {
Client.setMailConfig({ enabled: !$scope.mailConfig.enabled }, function (error) {
if (error) return console.error(error);
@@ -469,6 +478,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
fetchBackups();
getMailConfig();
getBackupConfig();
getDnsConfig();
if ($scope.config.provider === 'caas') {
getPlans();