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
186e488a
Commit
186e488a
authored
Jan 24, 2019
by
Demitri Swan
Committed by
Demitri Swan
Jan 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug Fix #14961
parent
c7b556c0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletions
+14
-1
public/app/features/templating/specs/template_srv.test.ts
+11
-0
public/app/features/templating/template_srv.ts
+3
-1
No files found.
public/app/features/templating/specs/template_srv.test.ts
View file @
186e488a
...
...
@@ -469,6 +469,11 @@ describe('templateSrv', () => {
name
:
'empty_on_init'
,
current
:
{
value
:
''
,
text
:
''
},
},
{
type
:
'custom'
,
name
:
'foo'
,
current
:
{
value
:
'constructor'
,
text
:
'constructor'
},
}
]);
_templateSrv
.
setGrafanaVariable
(
'$__auto_interval_interval'
,
'13m'
);
_templateSrv
.
updateTemplateData
();
...
...
@@ -483,6 +488,12 @@ describe('templateSrv', () => {
const
target
=
_templateSrv
.
replaceWithText
(
'Hello $empty_on_init'
);
expect
(
target
).
toBe
(
'Hello '
);
});
it
(
'should not return a string representation of a constructor property'
,
()
=>
{
const
target
=
_templateSrv
.
replaceWithText
(
'$foo'
);
expect
(
target
).
not
.
toBe
(
'function Object() { [native code] }'
);
expect
(
target
).
toBe
(
'constructor'
);
});
});
describe
(
'built in interval variables'
,
()
=>
{
...
...
public/app/features/templating/template_srv.ts
View file @
186e488a
...
...
@@ -254,7 +254,9 @@ export class TemplateSrv {
return
match
;
}
return
this
.
grafanaVariables
[
variable
.
current
.
value
]
||
variable
.
current
.
text
;
const
value
=
this
.
grafanaVariables
[
variable
.
current
.
value
];
return
typeof
(
value
)
===
'string'
?
value
:
variable
.
current
.
text
;
});
}
...
...
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