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

BackendSrv: Fix error alert logic (#26453)

Browse Source 
(cherry picked from commit fba329f3ac)
This commit is contained in:
Torkel Ödegaard
2020-08-05 13:48:06 +02:00
committed by Hugo Häggmark
parent dbb3750610
commit bb5c6bb009
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/template_srv.ts
+6 -5
View File
@@ -298,7 +298,8 @@ export class TemplateSrv implements BaseTemplateSrv {
variableExists(expression: string) {
const name = this.getVariableName(expression);
return name && this.getVariableAtIndex(name) !== void 0;
const variable = name && this.getVariableAtIndex(name);
return variable !== null && variable !== undefined;
}
highlightVariablesAsHtml(str: string) {
@@ -458,7 +459,7 @@ export class TemplateSrv implements BaseTemplateSrv {
return value.join(',');
}
private getVariableAtIndex = (name: string): any => {
private getVariableAtIndex(name: string) {
if (!name) {
return;
}
@@ -468,11 +469,11 @@ export class TemplateSrv implements BaseTemplateSrv {
}
return this.index[name];
};
}
private getAdHocVariables = (): any[] => {
private getAdHocVariables(): any[] {
return this.dependencies.getFilteredVariables(isAdHoc);
};
}
}
// Expose the template srv