Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2015-06-22 22:30:03 +02:00
commit ba2deb5f7b

View File

@ -49,9 +49,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
query = query.replace(/\$interval/g, (target.interval || options.interval));
// replace templated variables
query = templateSrv.replace(query);
query = templateSrv.replace(query, options.scopedVars);
var alias = target.alias ? templateSrv.replace(target.alias) : '';
var alias = target.alias ? templateSrv.replace(target.alias, options.scopedVars) : '';
var handleResponse = _.partial(handleInfluxQueryResponse, alias);
return this._seriesQuery(query).then(handleResponse);