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
6d3b6f3c
Unverified
Commit
6d3b6f3c
authored
Apr 05, 2019
by
Torkel Ödegaard
Committed by
GitHub
Apr 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: playlist now preserve the correct url query params (#16403)
Fixes #16377
parent
173e7fd8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
public/app/features/playlist/playlist_srv.ts
+7
-3
No files found.
public/app/features/playlist/playlist_srv.ts
View file @
6d3b6f3c
...
...
@@ -9,6 +9,12 @@ import locationUtil from 'app/core/utils/location_util';
import
kbn
from
'app/core/utils/kbn'
;
import
{
store
}
from
'app/store/store'
;
export
const
queryParamsToPreserve
:
{
[
key
:
string
]:
boolean
}
=
{
kiosk
:
true
,
autofitpanels
:
true
,
orgId
:
true
,
};
export
class
PlaylistSrv
{
private
cancelPromise
:
any
;
private
dashboards
:
Array
<
{
url
:
string
}
>
;
...
...
@@ -41,9 +47,7 @@ export class PlaylistSrv {
const
dash
=
this
.
dashboards
[
this
.
index
];
const
queryParams
=
this
.
$location
.
search
();
const
filteredParams
=
_
.
pickBy
(
queryParams
,
key
=>
{
return
key
===
'kiosk'
||
key
===
'autofitpanels'
||
key
===
'orgId'
;
});
const
filteredParams
=
_
.
pickBy
(
queryParams
,
(
value
:
any
,
key
:
string
)
=>
queryParamsToPreserve
[
key
]);
const
nextDashboardUrl
=
locationUtil
.
stripBaseFromUrl
(
dash
.
url
);
// this is done inside timeout to make sure digest happens after
...
...
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