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): fixed issue detecting template variable dependency, fixes #7354

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-02-20 09:31:50 +01:00
parent 492b2bd42f
commit 38126bc595
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -43,6 +43,7 @@
* **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
* **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
* **Templating**: Fixes error when using numeric sort on empty strings [#7382](https://github.com/grafana/grafana/issues/7382)
* **Templating**: Fixed issue detecting template variable dependency [#7354](https://github.com/grafana/grafana/issues/7354)
# 4.1.2 (2017-02-13)

7
public/app/features/templating/specs/variable_specs.ts
View File

@ -12,10 +12,15 @@ describe('containsVariable', function() {
});
it('should not find it if only part matches with $var syntax', function() {
var contains = containsVariable('this.$ServerDomain.filters', 'Server');
var contains = containsVariable('this.$serverDomain.filters', 'server');
expect(contains).to.be(false);
});
it('should find it if it ends with variable and passing multiple test strings', function() {
var contains = containsVariable('show field keys from $pgmetric', 'test string2', 'pgmetric');
expect(contains).to.be(true);
});
it('should find it with [[var]] syntax', function() {
var contains = containsVariable('this.[[test]].filters', 'test');
expect(contains).to.be(true);

2
public/app/features/templating/variable.ts
View File

@ -23,7 +23,7 @@ export function containsVariable(...args: any[]) {
var str = args[0] || '';
for (var i = 1; i < args.length-1; i++) {
str += args[i] || '';
str += ' ' + args[i] || '';
}
variableName = kbn.regexEscape(variableName);