Commit 5fbab038 by bergquist

fix(opentsdb): can always return false

parent 497eca01
...@@ -103,24 +103,23 @@ function (angular, _, dateMath) { ...@@ -103,24 +103,23 @@ function (angular, _, dateMath) {
}; };
this.targetContainsTemplate = function(target) { this.targetContainsTemplate = function(target) {
// Checking for template variables in filters if (target.filters && target.filters.length > 0) {
if (target.filters.length > 0) {
for (var i = 0; i < target.filters.length; i++) { for (var i = 0; i < target.filters.length; i++) {
if (templateSrv.variableExists(target.filters[i].filter)) { if (templateSrv.variableExists(target.filters[i].filter)) {
return true; return true;
} }
} }
} }
// Checking for template variables in tags
else if (Object.keys(target.tags).length > 0) { if (target.tags && Object.keys(target.tags).length > 0) {
for (var tagKey in target.tags) { for (var tagKey in target.tags) {
if (templateSrv.variableExists(target.tags[tagKey])) { if (templateSrv.variableExists(target.tags[tagKey])) {
return true; return true;
} }
} }
} else {
return false;
} }
return false;
}; };
this.performTimeSeriesQuery = function(queries, start, end) { this.performTimeSeriesQuery = function(queries, start, end) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment