Просмотр исходного кода

datasource: fix disable query when using mixed datasource (#16409)

This fixes an error that was thrown when one or several queries
was disabled using the mixed datasource.

Fixes #12977
Marcus Efraimsson 6 лет назад
Родитель
Сommit
4a70056d3c
1 измененных файлов с 9 добавлено и 1 удалено
  1. 9 1
      public/app/plugins/datasource/mixed/datasource.ts

+ 9 - 1
public/app/plugins/datasource/mixed/datasource.ts

@@ -13,9 +13,17 @@ class MixedDatasource {
         return this.$q([]);
         return this.$q([]);
       }
       }
 
 
+      const filtered = _.filter(targets, t => {
+        return !t.hide;
+      });
+
+      if (filtered.length === 0) {
+        return { data: [] };
+      }
+
       return this.datasourceSrv.get(dsName).then(ds => {
       return this.datasourceSrv.get(dsName).then(ds => {
         const opt = angular.copy(options);
         const opt = angular.copy(options);
-        opt.targets = targets;
+        opt.targets = filtered;
         return ds.query(opt);
         return ds.query(opt);
       });
       });
     });
     });