IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for Explore (empty page after running query)

Browse Source 
Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
This commit is contained in:
David Kaltschmidt 2018-09-14 16:09:43 +02:00
parent 270b736302
commit 1a38c45dde
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/features/templating/template_srv.ts
View File

@ -50,18 +50,20 @@ export class TemplateSrv {
getAdhocFilters(datasourceName) {
let filters = [];
for (let i = 0; i < this.variables.length; i++) {
const variable = this.variables[i];
if (variable.type !== 'adhoc') {
continue;
}
if (this.variables) {
for (let i = 0; i < this.variables.length; i++) {
const variable = this.variables[i];
if (variable.type !== 'adhoc') {
continue;
}
// null is the "default" datasource
if (variable.datasource === null || variable.datasource === datasourceName) {
filters = filters.concat(variable.filters);
} else if (variable.datasource.indexOf('$') === 0) {
if (this.replace(variable.datasource) === datasourceName) {
// null is the "default" datasource
if (variable.datasource === null || variable.datasource === datasourceName) {
filters = filters.concat(variable.filters);
} else if (variable.datasource.indexOf('$') === 0) {
if (this.replace(variable.datasource) === datasourceName) {
filters = filters.concat(variable.filters);
}
}
}
}