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

8
public/app/core/components/manage_dashboards/manage_dashboards.html
View File

@@ -9,7 +9,7 @@
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Dashboard Dashboard
</a> </a>
<a class="btn btn-success" href="/dashboards/folder/new" ng-if="!ctrl.folderId"> <a class="btn btn-success" href="dashboards/folder/new" ng-if="!ctrl.folderId">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Folder Folder
</a> </a>
@@ -108,11 +108,11 @@
<empty-list-cta model="{ <empty-list-cta model="{
title: 'This folder doesn\'t have any dashboards yet', title: 'This folder doesn\'t have any dashboards yet',
buttonIcon: 'gicon gicon-dashboard-new', buttonIcon: 'gicon gicon-dashboard-new',
buttonLink: '/dashboard/new?folderId={{ctrl.folderId}}', buttonLink: 'dashboard/new?folderId={{ctrl.folderId}}',
buttonTitle: 'Create Dashboard', buttonTitle: 'Create Dashboard',
proTip: 'Add dashboards into your folder at ->', proTip: 'Add dashboards into your folder at ->',
proTipLink: '/dashboards', proTipLink: 'dashboards',
proTipLinkTitle: 'Manage dashboards', proTipLinkTitle: 'Manage dashboards',
proTipTarget: '_blank' proTipTarget: ''
}" /> }" />
</div> </div>

2
public/app/core/components/manage_dashboards/manage_dashboards.ts
View File

@@ -276,7 +276,7 @@ export class ManageDashboardsCtrl {
} }
createDashboardUrl() { createDashboardUrl() {
let url = '/dashboard/new'; let url = 'dashboard/new';
if (this.folderId) { if (this.folderId) {
url += `?folderId=${this.folderId}`; url += `?folderId=${this.folderId}`;

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 => { return this.backendSrv.createDashboardFolder(this.title).then(result => {
appEvents.emit('alert-success', ['Folder Created', 'OK']); 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); 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) { 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: () => { onConfirm: () => {
return this.backendSrv.deleteDashboard(this.meta.slug).then(() => { return this.backendSrv.deleteDashboard(this.meta.slug).then(() => {
appEvents.emit('alert-success', ['Folder Deleted', `${this.dashboard.title} has been deleted`]); appEvents.emit('alert-success', ['Folder Deleted', `${this.dashboard.title} has been deleted`]);
this.$location.url('/dashboards'); this.$location.url('dashboards');
}); });
}, },
}); });