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(templating): another fix for templating and custom all value escaping, fixes #4787

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-22 13:59:54 +02:00
parent 2748a3fbd8
commit 1dfeb192a3
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/templating/templateValuesSrv.js
View File

@ -294,11 +294,6 @@ function (angular, _, kbn) {
}; };
this.addAllOption = function(variable) { this.addAllOption = function(variable) {
if (variable.allValue) {
variable.options.unshift({text: 'All', value: variable.allValue});
return;
}
variable.options.unshift({text: 'All', value: "$__all"}); variable.options.unshift({text: 'All', value: "$__all"});
}; };

2
public/test/specs/templateValuesSrv-specs.js
View File

@ -280,7 +280,7 @@ define([
}); });
it('should add All option with custom value', function() { it('should add All option with custom value', function() {
expect(scenario.variable.options[0].value).to.be('*'); expect(scenario.variable.options[0].value).to.be('$__all');
}); });
}); });