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: fix updating folder so that correct url is returned

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-01-31 18:10:28 +01:00
parent 035b724725
commit 8fc648ac43
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/core/services/backend_srv.ts
View File

@ -257,6 +257,17 @@ export class BackendSrv {
}); });
} }
updateDashboardFolder(dash, options) {
options = options || {};
return this.post('/api/dashboards/db/', {
dashboard: dash,
isFolder: true,
overwrite: options.overwrite === true,
message: options.message || '',
});
}
deleteDashboard(uid) { deleteDashboard(uid) {
let deferred = this.$q.defer(); let deferred = this.$q.defer();

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

@ -37,7 +37,7 @@ export class FolderSettingsCtrl {
this.dashboard.title = this.title.trim(); this.dashboard.title = this.title.trim();
return this.backendSrv return this.backendSrv
.saveDashboard(this.dashboard, { overwrite: false }) .updateDashboardFolder(this.dashboard, { overwrite: false })
.then(result => { .then(result => {
if (result.url !== this.$location.path()) { if (result.url !== this.$location.path()) {
this.$location.url(result.url + '/settings'); this.$location.url(result.url + '/settings');
@ -84,7 +84,7 @@ export class FolderSettingsCtrl {
yesText: 'Save & Overwrite', yesText: 'Save & Overwrite',
icon: 'fa-warning', icon: 'fa-warning',
onConfirm: () => { onConfirm: () => {
this.backendSrv.saveDashboard(this.dashboard, { overwrite: true }); this.backendSrv.updateDashboardFolder(this.dashboard, { overwrite: true });
}, },
}); });
} }