IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed opentsdb templating bug (#7208)

Browse Source
This commit is contained in:
Utkarsh Bhatnagar 2017-01-10 12:35:05 -08:00 committed by Torkel Ödegaard
parent 6518a0f765
commit 7e3ccdf983
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/templating/specs/template_srv_specs.ts
View File

@ -150,6 +150,11 @@ describe('templateSrv', function() {
expect(result).to.be('test,build=test2');
});
it('multi value and distributed should render when not string', function() {
var result = _templateSrv.formatValue(['test'], 'distributed', { name: 'build' });
expect(result).to.be('test');
});
it('slash should be properly escaped in regex format', function() {
var result = _templateSrv.formatValue('Gi3/14', 'regex');
expect(result).to.be('Gi3\\/14');

3
public/app/features/templating/templateSrv.js
View File

@ -97,6 +97,9 @@ function (angular, _, kbn) {
return value.join('|');
}
case "distributed": {
if (typeof value === 'string') {
return value;
}
return this.distributeVariable(value, variable.name);
}
default: {