interpolate 'field' again in Elasticsearch terms queries (#10026)

* interpolate 'field' again in Elasticsearch terms queries

Fix for #8662 which was regressed in commit e4950c2dc1 (the field 'field' was no longer interpolated)

* remove unnecessary check for existence of field 'field'
This commit is contained in:
Andrew Richards 2018-05-08 14:17:16 +01:00 committed by Torkel Ödegaard
parent 1888708ca5
commit 3095dabe3c

View File

@ -395,6 +395,7 @@ export class ElasticDatasource {
}
if (query.find === 'terms') {
query.field = this.templateSrv.replace(query.field, {}, 'lucene');
query.query = this.templateSrv.replace(query.query || '*', {}, 'lucene');
return this.getTerms(query);
}