dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvment view mail-setting

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-06-01 11:50:25 +03:00
parent 81851db5c0
commit a99d5d9fc2
2 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/app/admin/admin.controller.js
View File

@ -39,6 +39,9 @@ export default function AdminController(adminService, toast, $scope, $rootScope,
function loadSettings() { function loadSettings() {
adminService.getAdminSettings($state.$current.data.key).then(function success(settings) { adminService.getAdminSettings($state.$current.data.key).then(function success(settings) {
vm.settings = settings; vm.settings = settings;
if(vm.settings.jsonValue && vm.settings.jsonValue.enableTls && angular.isString(vm.settings.jsonValue.enableTls)){
vm.settings.jsonValue.enableTls = vm.settings.jsonValue.enableTls === 'true';
}
}); });
} }

73
ui/src/app/admin/outgoing-mail-settings.tpl.html
View File

@ -38,7 +38,7 @@
</md-input-container> </md-input-container>
<md-input-container class="md-block"> <md-input-container class="md-block">
<label translate>admin.smtp-protocol</label> <label translate>admin.smtp-protocol</label>
<md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.smtpProtocol"> <md-select ng-model="vm.settings.jsonValue.smtpProtocol">
<md-option ng-repeat="smtpProtocol in vm.smtpProtocols" value="{{smtpProtocol}}"> <md-option ng-repeat="smtpProtocol in vm.smtpProtocols" value="{{smtpProtocol}}">
{{smtpProtocol.toUpperCase()}} {{smtpProtocol.toUpperCase()}}
</md-option> </md-option>
@ -77,48 +77,55 @@
<div translate ng-message="pattern">admin.timeout-invalid</div> <div translate ng-message="pattern">admin.timeout-invalid</div>
<div translate ng-message="md-maxlength">admin.timeout-invalid</div> <div translate ng-message="md-maxlength">admin.timeout-invalid</div>
</div> </div>
</md-input-container> </md-input-container>
<md-checkbox ng-disabled="$root.loading" <md-checkbox class="md-block" layout="row"
aria-label="{{ 'admin.enable-tls' | translate }}" ng-model="vm.settings.jsonValue.enableTls">{{ 'admin.enable-tls' | translate }}</md-checkbox> aria-label="{{ 'admin.enable-tls' | translate }}"
ng-model="vm.settings.jsonValue.enableTls">
{{ 'admin.enable-tls' | translate }}
</md-checkbox>
<md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls"> <md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableTls">
<label translate>admin.tls-version</label> <label translate>admin.tls-version</label>
<md-select ng-disabled="$root.loading" ng-model="vm.settings.jsonValue.tlsVersion"> <md-select ng-model="vm.settings.jsonValue.tlsVersion">
<md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}"> <md-option ng-repeat="tlsVersion in vm.tlsVersions" value="{{tlsVersion}}">
{{tlsVersion}} {{tlsVersion}}
</md-option> </md-option>
</md-select> </md-select>
</md-input-container> </md-input-container>
<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"> <md-checkbox class="md-block" layout="row"
aria-label="{{ 'admin.enable-proxy' | translate }}"
ng-model="vm.settings.jsonValue.enableProxy">
{{ 'admin.enable-proxy' | translate }} {{ 'admin.enable-proxy' | translate }}
</md-checkbox> </md-checkbox>
<div layout-gt-sm="row"> <section ng-if="vm.settings.jsonValue.enableProxy">
<md-input-container class="md-block" flex="100" flex-gt-sm="60" ng-if="vm.settings.jsonValue.enableProxy"> <div layout-gt-sm="row">
<label translate>admin.proxy-host</label> <md-input-container class="md-block" flex="100" flex-gt-sm="60">
<input required name="proxyHost" ng-model="vm.settings.jsonValue.proxyHost"> <label translate>admin.proxy-host</label>
<div ng-messages="vm.settingsForm.proxyHost.$error"> <input required name="proxyHost" ng-model="vm.settings.jsonValue.proxyHost">
<div translate ng-message="required">admin.proxy-host-required</div> <div ng-messages="vm.settingsForm.proxyHost.$error">
<div translate ng-message="required">admin.proxy-host-required</div>
</div>
</md-input-container>
<md-input-container class="md-block" flex="100" flex-gt-sm="40">
<label translate>admin.proxy-port</label>
<input required name="proxyPort" ng-model="vm.settings.jsonValue.proxyPort"
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])$/"
md-maxlength="5">
<div ng-messages="vm.settingsForm.proxyPort.$error" role="alert" multiple>
<div translate ng-message="required">admin.proxy-port-required</div>
<div translate ng-message="pattern">admin.proxy-port-invalid</div>
<div translate ng-message="md-maxlength">admin.proxy-port-invalid</div>
</div>
</md-input-container>
</div> </div>
</md-input-container> <md-input-container class="md-block">
<md-input-container ng-if="vm.settings.jsonValue.enableProxy" class="md-block" flex="100" flex-gt-sm="40"> <label translate>admin.proxy-user</label>
<label translate>admin.proxy-port</label> <input name="proxyUser" ng-model="vm.settings.jsonValue.proxyUser">
<input required name="proxyPort" ng-model="vm.settings.jsonValue.proxyPort" </md-input-container>
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])$/" <md-input-container class="md-block">
md-maxlength="5"> <label translate>admin.proxy-password</label>
<div ng-messages="vm.settingsForm.proxyPort.$error" role="alert" multiple> <input name="proxyPassword" ng-model="vm.settings.jsonValue.proxyPassword">
<div translate ng-message="required">admin.proxy-port-required</div> </md-input-container>
<div translate ng-message="pattern">admin.proxy-port-invalid</div> </section>
<div translate ng-message="md-maxlength">admin.proxy-port-invalid</div>
</div>
</md-input-container>
</div>
<md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableProxy">
<label translate>admin.proxy-user</label>
<input name="proxyUser" ng-model="vm.settings.jsonValue.proxyUser">
</md-input-container>
<md-input-container class="md-block" ng-if="vm.settings.jsonValue.enableProxy">
<label translate>admin.proxy-password</label>
<input name="proxyPassword" ng-model="vm.settings.jsonValue.proxyPassword">
</md-input-container>
<md-input-container class="md-block"> <md-input-container class="md-block">
<label translate>common.username</label> <label translate>common.username</label>
<input name="username" placeholder="{{ 'common.enter-username' | translate }}" ng-model="vm.settings.jsonValue.username"> <input name="username" placeholder="{{ 'common.enter-username' | translate }}" ng-model="vm.settings.jsonValue.username">