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): fix for setting template variable value via url and having repeated panels or rows, fixes #2534

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-17 15:01:16 +02:00
parent 4f3a3329e2
commit 0d8303cf5d
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,9 +80,10 @@ function (angular, _, kbn) {
if (_.isArray(variable.current.value)) {
variable.current.text = variable.current.value.join(' + ');
self.selectOptionsForCurrentValue(variable);
}
self.selectOptionsForCurrentValue(variable);
templateSrv.updateTemplateData();
return self.updateOptionsInChildVariables(variable);
};
@@ -130,13 +131,20 @@ function (angular, _, kbn) {
};
this.selectOptionsForCurrentValue = function(variable) {
for (var i = 0; i < variable.current.value.length; i++) {
var value = variable.current.value[i];
for (var y = 0; y < variable.options.length; y++) {
var option = variable.options[y];
if (option.value === value) {
option.selected = true;
var i, y, value, option;
for (i = 0; i < variable.options.length; i++) {
option = variable.options[i];
option.selected = false;
if (_.isArray(variable.current.value)) {
for (y = 0; y < variable.current.value.length; y++) {
value = variable.current.value[i];
if (option.value === value) {
option.selected = true;
}
}
} else if (option.value === variable.current.value) {
option.selected = true;
}
}
};