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

feat(adhoc filters): good progress on ad hoc filters and sync from to url, #6038

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-20 11:57:43 +02:00
parent cb522d58cd
commit 6e429b8575
14 changed files with 351 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,18 +180,11 @@ function (angular, _, kbn) {
this.fillVariableValuesForUrl = function(params, scopedVars) {
_.each(this.variables, function(variable) {
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] = scopedVars[variable.name].value;
} else {
params['var-' + variable.name] = variable.getValueForUrl();
}
params['var-' + variable.name] = value;
});
};