IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402, fixes #10663

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-01-29 17:04:11 +01:00
parent 479658489a
commit b1cf4cf01c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/services/segment_srv.js
View File

@@ -89,7 +89,7 @@ function (angular, _, coreModule) {
if (addTemplateVars) { if (addTemplateVars) {
_.each(templateSrv.variables, function(variable) { _.each(templateSrv.variables, function(variable) {
if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) { if (variableTypeFilter === void 0 || variableTypeFilter === variable.type) {
segments.unshift(self.newSegment({ type: 'template', value: '$' + variable.name, expandable: true })); segments.unshift(self.newSegment({ type: 'value', value: '$' + variable.name, expandable: true }));
} }
}); });
} }

2
public/app/plugins/datasource/influxdb/query_ctrl.ts
View File

@@ -255,7 +255,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
for (let variable of this.templateSrv.variables) { for (let variable of this.templateSrv.variables) {
segments.unshift( segments.unshift(
this.uiSegmentSrv.newSegment({ this.uiSegmentSrv.newSegment({
type: 'template', type: 'value',
value: '/^$' + variable.name + '$/', value: '/^$' + variable.name + '$/',
expandable: true, expandable: true,
}) })