IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 03:34:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

PanelLinks: fixed issue with old panel links and grafana behind a subpath (#20298)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-11-11 12:18:58 +01:00 committed by GitHub
parent 422a94707d
commit 6f3f0bf3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/state/DashboardMigrator.test.ts
View File

@ -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`);
});
});

4
public/app/features/dashboard/state/DashboardMigrator.ts
View File

@ -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