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

dont shadow format passed in as function parameter

Browse Source
This commit is contained in:
Sven Klemm
2018-05-02 23:03:37 +02:00
parent 14bb7832af
commit 764fa15e24
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/templating/template_srv.ts
View File

@@ -179,16 +179,16 @@ export class TemplateSrv {
return target;
}
var variable, systemValue, value;
var variable, systemValue, value, fmt;
this.regex.lastIndex = 0;
return target.replace(this.regex, (match, var1, var2, fmt2, var3, fmt3) => {
variable = this.index[var1 || var2 || var3];
format = fmt2 || fmt3 || format;
fmt = fmt2 || fmt3 || format;
if (scopedVars) {
value = scopedVars[var1 || var2 || var3];
if (value) {
return this.formatValue(value.value, format, variable);
return this.formatValue(value.value, fmt, variable);
}
}
@@ -198,7 +198,7 @@ export class TemplateSrv {
systemValue = this.grafanaVariables[variable.current.value];
if (systemValue) {
return this.formatValue(systemValue, format, variable);
return this.formatValue(systemValue, fmt, variable);
}
value = variable.current.value;
@@ -210,7 +210,7 @@ export class TemplateSrv {
}
}
var res = this.formatValue(value, format, variable);
var res = this.formatValue(value, fmt, variable);
return res;
});
}