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
6f3f0bf3
Unverified
Commit
6f3f0bf3
authored
Nov 11, 2019
by
Torkel Ödegaard
Committed by
GitHub
Nov 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PanelLinks: fixed issue with old panel links and grafana behind a subpath (#20298)
parent
422a9470
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
public/app/features/dashboard/state/DashboardMigrator.test.ts
+1
-1
public/app/features/dashboard/state/DashboardMigrator.ts
+2
-2
No files found.
public/app/features/dashboard/state/DashboardMigrator.test.ts
View file @
6f3f0bf3
...
...
@@ -438,7 +438,7 @@ describe('DashboardModel', () => {
});
it
(
'should slugify dashboard name'
,
()
=>
{
expect
(
model
.
panels
[
0
].
links
[
3
].
url
).
toBe
(
`
/
dashboard/db/my-other-dashboard`
);
expect
(
model
.
panels
[
0
].
links
[
3
].
url
).
toBe
(
`dashboard/db/my-other-dashboard`
);
});
});
...
...
public/app/features/dashboard/state/DashboardMigrator.ts
View file @
6f3f0bf3
...
...
@@ -685,11 +685,11 @@ function upgradePanelLink(link: any): DataLink {
let
url
=
link
.
url
;
if
(
!
url
&&
link
.
dashboard
)
{
url
=
`
/
dashboard/db/
${
kbn
.
slugifyForUrl
(
link
.
dashboard
)}
`
;
url
=
`dashboard/db/
${
kbn
.
slugifyForUrl
(
link
.
dashboard
)}
`
;
}
if
(
!
url
&&
link
.
dashUri
)
{
url
=
`
/
dashboard/
${
link
.
dashUri
}
`
;
url
=
`dashboard/
${
link
.
dashUri
}
`
;
}
// some models are incomplete and have no dashboard or dashUri
...
...
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