opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 12:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-31 19:02:46 +02:00
parent 650e2faf01 abbb6f933c
commit 265d5daf57
183 changed files with 1048 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ export class PostgresConfigCtrl {
datasourceSrv: any;
showTimescaleDBHelp: boolean;
/** @ngInject **/
/** @ngInject */
constructor($scope, datasourceSrv) {
this.datasourceSrv = datasourceSrv;
this.current.jsonData.sslmode = this.current.jsonData.sslmode || 'verify-full';
@ -34,8 +34,8 @@ export class PostgresConfigCtrl {
});
}
let major = Math.trunc(version / 100);
let minor = version % 100;
const major = Math.trunc(version / 100);
const minor = version % 100;
let name = String(major);
if (version < 1000) {
name = String(major) + '.' + String(minor);