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

dashboards: update dashboard/folder url if browser url is not the same as from backend

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-01-31 18:24:47 +01:00
parent c0c3f17d84
commit 40c83e3e22
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/dashboard/folder_dashboards_ctrl.ts
View File

@@ -6,13 +6,17 @@ export class FolderDashboardsCtrl {
uid: string;
/** @ngInject */
constructor(private backendSrv, navModelSrv, private $routeParams) {
constructor(private backendSrv, navModelSrv, private $routeParams, $location) {
if (this.$routeParams.uid) {
this.uid = $routeParams.uid;
const loader = new FolderPageLoader(this.backendSrv);
loader.load(this, this.uid, 'manage-folder-dashboards');
loader.load(this, this.uid, 'manage-folder-dashboards').then(folder => {
if ($location.path() !== folder.meta.url) {
$location.path(folder.meta.url).replace();
}
});
}
}
}

8
public/app/features/dashboard/folder_permissions_ctrl.ts
View File

@@ -6,11 +6,15 @@ export class FolderPermissionsCtrl {
uid: string;
/** @ngInject */
constructor(private backendSrv, navModelSrv, private $routeParams) {
constructor(private backendSrv, navModelSrv, private $routeParams, $location) {
if (this.$routeParams.uid) {
this.uid = $routeParams.uid;
new FolderPageLoader(this.backendSrv).load(this, this.uid, 'manage-folder-permissions');
new FolderPageLoader(this.backendSrv).load(this, this.uid, 'manage-folder-permissions').then(folder => {
if ($location.path() !== folder.meta.url) {
$location.path(`${folder.meta.url}/permissions`).replace();
}
});
}
}
}

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

@@ -18,10 +18,14 @@ export class FolderSettingsCtrl {
this.uid = $routeParams.uid;
this.folderPageLoader = new FolderPageLoader(this.backendSrv);
this.folderPageLoader.load(this, this.uid, 'manage-folder-settings').then(result => {
this.dashboard = result.dashboard;
this.meta = result.meta;
this.canSave = result.meta.canSave;
this.folderPageLoader.load(this, this.uid, 'manage-folder-settings').then(folder => {
if ($location.path() !== folder.meta.url) {
$location.path(`${folder.meta.url}/settings`).replace();
}
this.dashboard = folder.dashboard;
this.meta = folder.meta;
this.canSave = folder.meta.canSave;
this.title = this.dashboard.title;
});
}

4
public/app/routes/dashboard_loaders.ts
View File

@@ -29,6 +29,10 @@ export class LoadDashboardCtrl {
}
dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then(function(result) {
if ($location.path() !== result.meta.url) {
$location.path(result.meta.url).replace();
}
if ($routeParams.keepRows) {
result.meta.keepRows = true;
}