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
676972e7
Commit
676972e7
authored
Apr 01, 2020
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Variables: Do not update variable from url when value is the same (#23220)
(cherry picked from commit
49d2910e
)
parent
3be46855
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletions
+9
-1
public/app/features/templating/variable_srv.ts
+9
-1
No files found.
public/app/features/templating/variable_srv.ts
View file @
676972e7
...
@@ -330,9 +330,12 @@ export class VariableSrv {
...
@@ -330,9 +330,12 @@ export class VariableSrv {
for
(
const
v
of
this
.
variables
)
{
for
(
const
v
of
this
.
variables
)
{
const
key
=
`var-
${
v
.
name
}
`
;
const
key
=
`var-
${
v
.
name
}
`
;
if
(
vars
.
hasOwnProperty
(
key
))
{
if
(
vars
.
hasOwnProperty
(
key
))
{
update
.
push
(
v
.
setValueFromUrl
(
vars
[
key
]));
if
(
this
.
isVariableUrlValueDifferentFromCurrent
(
v
,
vars
[
key
]))
{
update
.
push
(
v
.
setValueFromUrl
(
vars
[
key
]));
}
}
}
}
}
if
(
update
.
length
)
{
if
(
update
.
length
)
{
Promise
.
all
(
update
).
then
(()
=>
{
Promise
.
all
(
update
).
then
(()
=>
{
this
.
dashboard
.
templateVariableValueUpdated
();
this
.
dashboard
.
templateVariableValueUpdated
();
...
@@ -341,6 +344,11 @@ export class VariableSrv {
...
@@ -341,6 +344,11 @@ export class VariableSrv {
}
}
}
}
isVariableUrlValueDifferentFromCurrent
(
variable
:
any
,
urlValue
:
any
)
{
// lodash _.isEqual handles array of value equality checks as well
return
!
_
.
isEqual
(
variable
.
current
.
value
,
urlValue
);
}
updateUrlParamsWithCurrentVariables
()
{
updateUrlParamsWithCurrentVariables
()
{
// update url
// update url
const
params
=
this
.
$location
.
search
();
const
params
=
this
.
$location
.
search
();
...
...
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