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 with detecting data source variable in other template variable definition, fixes #5165

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-25 10:46:35 +02:00
parent 8c2b6b532d
commit 0daadc954c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ function (angular, _) {
}
variableName = regexEscape(variableName);
var findVarRegex = new RegExp('\\$(' + variableName + ')[\\W|$]|\\[\\[(' + variableName + ')\\]\\]', 'g');
var findVarRegex = new RegExp('\\$(' + variableName + ')(?:\\W|$)|\\[\\[(' + variableName + ')\\]\\]', 'g');
var match = findVarRegex.exec(str);
return match !== null;
};

4
public/test/specs/templateSrv-specs.js
View File

@ -205,6 +205,10 @@ define([
expect(contains).to.be(true);
});
it('should find it its the only thing', function() {
var contains = _templateSrv.containsVariable('$env', 'env');
expect(contains).to.be(true);
});
});
describe('updateTemplateData with simple value', function() {