IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashfolders: relative links should work when root_path is specified (#10363)

Browse Source 
Fixes #10336
This commit is contained in:
Marcus Efraimsson
2017-12-31 12:24:21 +01:00
committed by Torkel Ödegaard
parent d210e766e7
commit 11ae7d5964
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/create_folder_ctrl.ts
View File

@@ -20,7 +20,7 @@ export class CreateFolderCtrl {
return this.backendSrv.createDashboardFolder(this.title).then(result => {
appEvents.emit('alert-success', ['Folder Created', 'OK']);
var folderUrl = `/dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
var folderUrl = `dashboards/folder/${result.dashboard.id}/${result.meta.slug}`;
this.$location.url(folderUrl);
});
}

2
public/app/features/dashboard/folder_page_loader.ts
View File

@@ -65,6 +65,6 @@ export class FolderPageLoader {
}
createFolderUrl(folderId: number, type: string, slug: string) {
return `/dashboards/folder/${folderId}/${slug}`;
return `dashboards/folder/${folderId}/${slug}`;
}
}

2
public/app/features/dashboard/folder_settings_ctrl.ts
View File

@@ -67,7 +67,7 @@ export class FolderSettingsCtrl {
onConfirm: () => {
return this.backendSrv.deleteDashboard(this.meta.slug).then(() => {
appEvents.emit('alert-success', ['Folder Deleted', `${this.dashboard.title} has been deleted`]);
this.$location.url('/dashboards');
this.$location.url('dashboards');
});
},
});