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

Improve mail server settings

Browse Source
This commit is contained in:
Igor Kulikov 2020-06-01 15:22:42 +03:00
parent a054be36ac
commit 9e94611004
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
View File

@ -76,10 +76,10 @@
{{ 'admin.timeout-invalid' | translate }} {{ 'admin.timeout-invalid' | translate }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<tb-checkbox formControlName="enableTls" trueValue="true" falseValue="false" style="display: block; padding-bottom: 16px;"> <tb-checkbox formControlName="enableTls" style="display: block; padding-bottom: 16px;">
{{ 'admin.enable-tls' | translate }} {{ 'admin.enable-tls' | translate }}
</tb-checkbox> </tb-checkbox>
<mat-form-field class="mat-block" *ngIf="mailSettings.get('enableTls').value === 'true'"> <mat-form-field class="mat-block" *ngIf="mailSettings.get('enableTls').value">
<mat-label translate>admin.tls-version</mat-label> <mat-label translate>admin.tls-version</mat-label>
<mat-select formControlName="tlsVersion"> <mat-select formControlName="tlsVersion">
<mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion"> <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">

6
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.ts
View File

@ -25,6 +25,7 @@ import { AdminService } from '@core/http/admin.service';
import { ActionNotificationShow } from '@core/notification/notification.actions'; import { ActionNotificationShow } from '@core/notification/notification.actions';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard';
import { isString } from '@core/utils';
@Component({ @Component({
selector: 'tb-mail-server', selector: 'tb-mail-server',
@ -52,6 +53,9 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
this.adminService.getAdminSettings<MailServerSettings>('mail').subscribe( this.adminService.getAdminSettings<MailServerSettings>('mail').subscribe(
(adminSettings) => { (adminSettings) => {
this.adminSettings = adminSettings; this.adminSettings = adminSettings;
if (this.adminSettings.jsonValue && isString(this.adminSettings.jsonValue.enableTls)) {
this.adminSettings.jsonValue.enableTls = (this.adminSettings.jsonValue.enableTls as any) === 'true';
}
this.mailSettings.reset(this.adminSettings.jsonValue); this.mailSettings.reset(this.adminSettings.jsonValue);
this.enableProxyChanged(); this.enableProxyChanged();
} }
@ -69,7 +73,7 @@ export class MailServerComponent extends PageComponent implements OnInit, HasCon
timeout: ['10000', [Validators.required, timeout: ['10000', [Validators.required,
Validators.pattern(/^[0-9]{1,6}$/), Validators.pattern(/^[0-9]{1,6}$/),
Validators.maxLength(6)]], Validators.maxLength(6)]],
enableTls: ['false'], enableTls: [false],
tlsVersion: [], tlsVersion: [],
enableProxy: [false, []], enableProxy: [false, []],
proxyHost: ['', [Validators.required]], proxyHost: ['', [Validators.required]],