opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 01:13:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

SQL data sources: Fix configuration UI (#33110)

Browse Source 
* fix frontend mssql/postgres

* fix frontend

Co-authored-by: Ying WANG <ying.wang@grafana.com>
This commit is contained in:
Arve Knudsen
2021-04-19 10:30:29 +02:00
committed by GitHub
parent 0c64d88d64
commit 381e4a51cd
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/mssql/config_ctrl.ts
View File

@ -16,6 +16,7 @@ export class MssqlConfigCtrl {
/** @ngInject */ /** @ngInject */
constructor($scope: any) { constructor($scope: any) {
this.current = $scope.ctrl.current;
this.current.jsonData.encrypt = this.current.jsonData.encrypt || 'false'; this.current.jsonData.encrypt = this.current.jsonData.encrypt || 'false';
this.current.jsonData.authenticationType = this.current.jsonData.authenticationType || 'SQL Server Authentication'; this.current.jsonData.authenticationType = this.current.jsonData.authenticationType || 'SQL Server Authentication';
this.onPasswordReset = createResetHandler(this, PasswordFieldEnum.Password); this.onPasswordReset = createResetHandler(this, PasswordFieldEnum.Password);

1
public/app/plugins/datasource/postgres/config_ctrl.ts
View File

@ -19,6 +19,7 @@ export class PostgresConfigCtrl {
/** @ngInject */ /** @ngInject */
constructor($scope: any, datasourceSrv: DatasourceSrv) { constructor($scope: any, datasourceSrv: DatasourceSrv) {
this.current = $scope.ctrl.current;
this.datasourceSrv = datasourceSrv; this.datasourceSrv = datasourceSrv;
this.current.jsonData.sslmode = this.current.jsonData.sslmode || 'verify-full'; this.current.jsonData.sslmode = this.current.jsonData.sslmode || 'verify-full';
this.current.jsonData.tlsConfigurationMethod = this.current.jsonData.tlsConfigurationMethod || 'file-path'; this.current.jsonData.tlsConfigurationMethod = this.current.jsonData.tlsConfigurationMethod || 'file-path';