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 scoped vars issue when generating urls for panel links, fixes #2410

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-30 08:28:42 +02:00
parent aaae23e9f0
commit 2cc53f328b
4 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,17 +115,20 @@ function (angular, _) {
});
};
this.fillVariableValuesForUrl = function(params) {
var toUrlVal = function(current) {
if (current.text === 'All') {
return 'All';
} else {
return current.value;
}
};
this.fillVariableValuesForUrl = function(params, scopedVars) {
_.each(this.variables, function(variable) {
params['var-' + variable.name] = toUrlVal(variable.current);
var current = variable.current;
var value = current.value;
if (current.text === 'All') {
value = 'All';
}
if (scopedVars && scopedVars[variable.name] !== void 0) {
value = scopedVars[variable.name].value;
}
params['var-' + variable.name] = value;
});
};