public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312, fixes #4311

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-14 10:18:43 +01:00
parent fc6ad2059a
commit 4aba3bc62b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/templateSrv.js
+7 -3
View File
@@ -43,6 +43,9 @@ function (angular, _) {
} }
this.formatValue = function(value, format, variable) { this.formatValue = function(value, format, variable) {
// for some scopedVars there is no variable
variable = variable || {};
if (typeof format === 'function') { if (typeof format === 'function') {
return format(value, variable, this.formatValue); return format(value, variable, this.formatValue);
} }
@@ -126,9 +129,6 @@ function (angular, _) {
return target.replace(this._regex, function(match, g1, g2) { return target.replace(this._regex, function(match, g1, g2) {
variable = self._index[g1 || g2]; variable = self._index[g1 || g2];
if (!variable) {
return match;
}
if (scopedVars) { if (scopedVars) {
value = scopedVars[g1 || g2]; value = scopedVars[g1 || g2];
@@ -137,6 +137,10 @@ function (angular, _) {
} }
} }
if (!variable) {
return match;
}
systemValue = self._grafanaVariables[variable.current.value]; systemValue = self._grafanaVariables[variable.current.value];
if (systemValue) { if (systemValue) {
return self.formatValue(systemValue, format, variable); return self.formatValue(systemValue, format, variable);