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

dashfolders: fix moving plugin dashboard to folder

Browse Source 
If moving a dashboard and the server responds with a plugin-dashboard
error we add the overwrite flag and moving the dashboard again.
Fixes #10183
This commit is contained in:
Marcus Efraimsson 2017-12-14 16:51:23 +01:00
parent b1bb012343
commit 62e6fed5ce
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,8 +297,8 @@ export class BackendSrv {
this.getDashboard('db', slug).then(fullDash => {
const model = new DashboardModel(fullDash.dashboard, fullDash.meta);
if ((!model.folderId && toFolder.id === 0) ||
model.folderId === toFolder.id) {
if ((!fullDash.meta.folderId && toFolder.id === 0) ||
fullDash.meta.folderId === toFolder.id) {
deferred.resolve({alreadyInFolder: true});
return;
}
@ -312,7 +312,18 @@ export class BackendSrv {
.then(() => {
deferred.resolve({succeeded: true});
}).catch(err => {
deferred.resolve({succeeded: false});
if (err.data && err.data.status === "plugin-dashboard") {
err.isHandled = true;
this.saveDashboard(clone, {overwrite: true})
.then(() => {
deferred.resolve({succeeded: true});
}).catch(err => {
deferred.resolve({succeeded: false});
});
} else {
deferred.resolve({succeeded: false});
}
});
});