Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
fba329f3
Unverified
Commit
fba329f3
authored
Jul 20, 2020
by
Torkel Ödegaard
Committed by
GitHub
Jul 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BackendSrv: Fix error alert logic (#26453)
parent
9486f960
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
public/app/features/templating/template_srv.test.ts
+0
-0
public/app/features/templating/template_srv.ts
+6
-5
No files found.
public/app/features/templating/template_srv.test.ts
0 → 100644
View file @
fba329f3
This diff is collapsed.
Click to expand it.
public/app/features/templating/template_srv.ts
View file @
fba329f3
...
@@ -267,7 +267,8 @@ export class TemplateSrv implements BaseTemplateSrv {
...
@@ -267,7 +267,8 @@ export class TemplateSrv implements BaseTemplateSrv {
variableExists
(
expression
:
string
):
boolean
{
variableExists
(
expression
:
string
):
boolean
{
const
name
=
this
.
getVariableName
(
expression
);
const
name
=
this
.
getVariableName
(
expression
);
return
(
name
&&
this
.
getVariableAtIndex
(
name
))
!==
undefined
;
const
variable
=
name
&&
this
.
getVariableAtIndex
(
name
);
return
variable
!==
null
&&
variable
!==
undefined
;
}
}
highlightVariablesAsHtml
(
str
:
string
)
{
highlightVariablesAsHtml
(
str
:
string
)
{
...
@@ -427,7 +428,7 @@ export class TemplateSrv implements BaseTemplateSrv {
...
@@ -427,7 +428,7 @@ export class TemplateSrv implements BaseTemplateSrv {
return
value
.
join
(
','
);
return
value
.
join
(
','
);
}
}
private
getVariableAtIndex
=
(
name
:
string
):
any
=>
{
private
getVariableAtIndex
(
name
:
string
)
{
if
(
!
name
)
{
if
(
!
name
)
{
return
;
return
;
}
}
...
@@ -437,11 +438,11 @@ export class TemplateSrv implements BaseTemplateSrv {
...
@@ -437,11 +438,11 @@ export class TemplateSrv implements BaseTemplateSrv {
}
}
return
this
.
index
[
name
];
return
this
.
index
[
name
];
}
;
}
private
getAdHocVariables
=
():
any
[]
=>
{
private
getAdHocVariables
():
any
[]
{
return
this
.
dependencies
.
getFilteredVariables
(
isAdHoc
);
return
this
.
dependencies
.
getFilteredVariables
(
isAdHoc
);
}
;
}
}
}
// Expose the template srv
// Expose the template srv
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment