Browse Source

Hotfix for Explore (empty page after running query)

Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
David Kaltschmidt 7 years ago
parent
commit
1a38c45dde
1 changed files with 12 additions and 10 deletions
  1. 12 10
      public/app/features/templating/template_srv.ts

+ 12 - 10
public/app/features/templating/template_srv.ts

@@ -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);
+          }
         }
       }
     }