Commit 55d2e611f6a0e80c0fcc052344d789a4734e3be7
Committed by
GitHub
GitHub
Merge pull request #2890 from vvlladd28/improvement/mail-settings
Improvment view mail-setting
Showing
2 changed files
with
43 additions
and
33 deletions
| @@ -39,6 +39,9 @@ export default function AdminController(adminService, toast, $scope, $rootScope, | @@ -39,6 +39,9 @@ export default function AdminController(adminService, toast, $scope, $rootScope, | ||
| 39 | function loadSettings() { | 39 | function loadSettings() { |
| 40 | adminService.getAdminSettings($state.$current.data.key).then(function success(settings) { | 40 | adminService.getAdminSettings($state.$current.data.key).then(function success(settings) { |
| 41 | vm.settings = settings; | 41 | vm.settings = settings; |
| 42 | + if(vm.settings.jsonValue && vm.settings.jsonValue.enableTls && angular.isString(vm.settings.jsonValue.enableTls)){ | ||
| 43 | + vm.settings.jsonValue.enableTls = vm.settings.jsonValue.enableTls === 'true'; | ||
| 44 | + } | ||
| 42 | }); | 45 | }); |
| 43 | } | 46 | } |
| 44 | 47 |
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | </md-input-container> | 38 | </md-input-container> |
| 39 | <md-input-container class="md-block"> | 39 | <md-input-container class="md-block"> |
| 40 | <label translate>admin.smtp-protocol</label> | 40 | <label translate>admin.smtp-protocol</label> |
| 41 | - <md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.smtpProtocol"> | 41 | + <md-select ng-model="vm.settings.jsonValue.smtpProtocol"> |
| 42 | <md-option ng-repeat="smtpProtocol in vm.smtpProtocols" value="{{smtpProtocol}}"> | 42 | <md-option ng-repeat="smtpProtocol in vm.smtpProtocols" value="{{smtpProtocol}}"> |
| 43 | {{smtpProtocol.toUpperCase()}} | 43 | {{smtpProtocol.toUpperCase()}} |
| 44 | </md-option> | 44 | </md-option> |
| @@ -77,48 +77,55 @@ | @@ -77,48 +77,55 @@ | ||
| 77 | <div translate ng-message="pattern">admin.timeout-invalid</div> | 77 | <div translate ng-message="pattern">admin.timeout-invalid</div> |
| 78 | <div translate ng-message="md-maxlength">admin.timeout-invalid</div> | 78 | <div translate ng-message="md-maxlength">admin.timeout-invalid</div> |
| 79 | </div> | 79 | </div> |
| 80 | - </md-input-container> | ||
| 81 | - <md-checkbox ng-disabled="$root.loading" | ||
| 82 | - aria-label="{{ 'admin.enable-tls' | translate }}" ng-model="vm.settings.jsonValue.enableTls">{{ 'admin.enable-tls' | translate }}</md-checkbox> | 80 | + </md-input-container> |
| 81 | + <md-checkbox class="md-block" layout="row" | ||
| 82 | + aria-label="{{ 'admin.enable-tls' | translate }}" | ||
| 83 | + ng-model="vm.settings.jsonValue.enableTls"> | ||
| 84 | + {{ 'admin.enable-tls' | translate }} | ||
| 85 | + </md-checkbox> | ||
| 83 | <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls"> | 86 | <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls"> |
| 84 | <label translate>admin.tls-version</label> | 87 | <label translate>admin.tls-version</label> |
| 85 | - <md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.tlsVersion"> | 88 | + <md-select ng-model="vm.settings.jsonValue.tlsVersion"> |
| 86 | <md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}"> | 89 | <md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}"> |
| 87 | {{tlsVersion}} | 90 | {{tlsVersion}} |
| 88 | </md-option> | 91 | </md-option> |
| 89 | </md-select> | 92 | </md-select> |
| 90 | </md-input-container> | 93 | </md-input-container> |
| 91 | - <md-checkbox class="md-block" flex="100" flex-gt-sm="60" ng-disabled="$root.loading" aria-label="{{ 'admin.enable-proxy' | translate }}" ng-model="vm.settings.jsonValue.enableProxy"> | 94 | + <md-checkbox class="md-block" layout="row" |
| 95 | + aria-label="{{ 'admin.enable-proxy' | translate }}" | ||
| 96 | + ng-model="vm.settings.jsonValue.enableProxy"> | ||
| 92 | {{ 'admin.enable-proxy' | translate }} | 97 | {{ 'admin.enable-proxy' | translate }} |
| 93 | </md-checkbox> | 98 | </md-checkbox> |
| 94 | - <div layout-gt-sm="row"> | ||
| 95 | - <md-input-container class="md-block" flex="100" flex-gt-sm="60" ng-if="vm.settings.jsonValue.enableProxy"> | ||
| 96 | - <label translate>admin.proxy-host</label> | ||
| 97 | - <input required name="proxyHost" ng-model="vm.settings.jsonValue.proxyHost"> | ||
| 98 | - <div ng-messages="vm.settingsForm.proxyHost.$error"> | ||
| 99 | - <div translate ng-message="required">admin.proxy-host-required</div> | ||
| 100 | - </div> | ||
| 101 | - </md-input-container> | ||
| 102 | - <md-input-container ng-if="vm.settings.jsonValue.enableProxy" class="md-block" flex="100" flex-gt-sm="40"> | ||
| 103 | - <label translate>admin.proxy-port</label> | ||
| 104 | - <input required name="proxyPort" ng-model="vm.settings.jsonValue.proxyPort" | ||
| 105 | - ng-pattern="/^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/" | ||
| 106 | - md-maxlength="5"> | ||
| 107 | - <div ng-messages="vm.settingsForm.proxyPort.$error" role="alert" multiple> | ||
| 108 | - <div translate ng-message="required">admin.proxy-port-required</div> | ||
| 109 | - <div translate ng-message="pattern">admin.proxy-port-invalid</div> | ||
| 110 | - <div translate ng-message="md-maxlength">admin.proxy-port-invalid</div> | 99 | + <section ng-if="vm.settings.jsonValue.enableProxy"> |
| 100 | + <div layout-gt-sm="row"> | ||
| 101 | + <md-input-container class="md-block" flex="100" flex-gt-sm="60"> | ||
| 102 | + <label translate>admin.proxy-host</label> | ||
| 103 | + <input required name="proxyHost" ng-model="vm.settings.jsonValue.proxyHost"> | ||
| 104 | + <div ng-messages="vm.settingsForm.proxyHost.$error"> | ||
| 105 | + <div translate ng-message="required">admin.proxy-host-required</div> | ||
| 106 | + </div> | ||
| 107 | + </md-input-container> | ||
| 108 | + <md-input-container class="md-block" flex="100" flex-gt-sm="40"> | ||
| 109 | + <label translate>admin.proxy-port</label> | ||
| 110 | + <input required name="proxyPort" ng-model="vm.settings.jsonValue.proxyPort" | ||
| 111 | + ng-pattern="/^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/" | ||
| 112 | + md-maxlength="5"> | ||
| 113 | + <div ng-messages="vm.settingsForm.proxyPort.$error" role="alert" multiple> | ||
| 114 | + <div translate ng-message="required">admin.proxy-port-required</div> | ||
| 115 | + <div translate ng-message="pattern">admin.proxy-port-invalid</div> | ||
| 116 | + <div translate ng-message="md-maxlength">admin.proxy-port-invalid</div> | ||
| 117 | + </div> | ||
| 118 | + </md-input-container> | ||
| 111 | </div> | 119 | </div> |
| 112 | - </md-input-container> | ||
| 113 | - </div> | ||
| 114 | - <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableProxy"> | ||
| 115 | - <label translate>admin.proxy-user</label> | ||
| 116 | - <input name="proxyUser" ng-model="vm.settings.jsonValue.proxyUser"> | ||
| 117 | - </md-input-container> | ||
| 118 | - <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableProxy"> | ||
| 119 | - <label translate>admin.proxy-password</label> | ||
| 120 | - <input name="proxyPassword" ng-model="vm.settings.jsonValue.proxyPassword"> | ||
| 121 | - </md-input-container> | 120 | + <md-input-container class="md-block"> |
| 121 | + <label translate>admin.proxy-user</label> | ||
| 122 | + <input name="proxyUser" ng-model="vm.settings.jsonValue.proxyUser"> | ||
| 123 | + </md-input-container> | ||
| 124 | + <md-input-container class="md-block"> | ||
| 125 | + <label translate>admin.proxy-password</label> | ||
| 126 | + <input name="proxyPassword" ng-model="vm.settings.jsonValue.proxyPassword"> | ||
| 127 | + </md-input-container> | ||
| 128 | + </section> | ||
| 122 | <md-input-container class="md-block"> | 129 | <md-input-container class="md-block"> |
| 123 | <label translate>common.username</label> | 130 | <label translate>common.username</label> |
| 124 | <input name="username" placeholder="{{ 'common.enter-username' | translate }}" ng-model="vm.settings.jsonValue.username"> | 131 | <input name="username" placeholder="{{ 'common.enter-username' | translate }}" ng-model="vm.settings.jsonValue.username"> |