IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13708 from svenklemm/interpolateVariable

Browse Source 
postgres: fix template variables error
This commit is contained in:
Marcus Efraimsson 2018-10-17 13:42:47 +02:00 committed by GitHub
commit cf93b1e700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/postgres/datasource.ts
View File

@ -20,7 +20,7 @@ export class PostgresDatasource {
this.interval = (instanceSettings.jsonData || {}).timeInterval; this.interval = (instanceSettings.jsonData || {}).timeInterval;
} }
interpolateVariable(value, variable) { interpolateVariable = (value, variable) => {
if (typeof value === 'string') { if (typeof value === 'string') {
if (variable.multi || variable.includeAll) { if (variable.multi || variable.includeAll) {
return this.queryModel.quoteLiteral(value); return this.queryModel.quoteLiteral(value);
@ -37,7 +37,7 @@ export class PostgresDatasource {
return this.queryModel.quoteLiteral(v); return this.queryModel.quoteLiteral(v);
}); });
return quotedValues.join(','); return quotedValues.join(',');
} };
query(options) { query(options) {
const queries = _.filter(options.targets, target => { const queries = _.filter(options.targets, target => {