From 6ad7db522a073bdcf27c9c2f2b6ee6b18f1eb3b2 Mon Sep 17 00:00:00 2001 From: "Rajaa.BARHTAOUI" Date: Tue, 6 Oct 2020 15:16:27 +0200 Subject: [PATCH] fix(xo-web/vm/disks): fix "not enough permissions" error (#5299) Introduced by 1116530a6be539e644516f9e685bac57b72e78cb --- CHANGELOG.unreleased.md | 1 + packages/xo-web/src/xo-app/vm/tab-disks.js | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 9faf6e5da..6135b87fe 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -18,6 +18,7 @@ - [New network] Remove the possibility of creating a network on a bond member interface (PR [#5262](https://github.com/vatesfr/xen-orchestra/pull/5262)) - [User] Fix custom filters not showing up when selecting a default filter for templates (PR [#5298](https://github.com/vatesfr/xen-orchestra/pull/5298)) - [Self/VDI migration] Fix hidden VDI after migration (PR [#5296](https://github.com/vatesfr/xen-orchestra/pull/5296)) +- [Self/VDI migration] Fix `not enough permissions` error (PR [#5299](https://github.com/vatesfr/xen-orchestra/pull/5299)) ### Packages to release diff --git a/packages/xo-web/src/xo-app/vm/tab-disks.js b/packages/xo-web/src/xo-app/vm/tab-disks.js index dce560465..6461e135c 100644 --- a/packages/xo-web/src/xo-app/vm/tab-disks.js +++ b/packages/xo-web/src/xo-app/vm/tab-disks.js @@ -557,13 +557,14 @@ export default class TabDisks extends Component { newDisk: false, }) - _migrateVdis = vdis => - confirm({ + _migrateVdis = vdis => { + const { resolvedResourceSet, vm } = this.props + return confirm({ title: _('vdiMigrate'), body: ( ), @@ -572,8 +573,17 @@ export default class TabDisks extends Component { return error(_('vdiMigrateNoSr'), _('vdiMigrateNoSrMessage')) } - return Promise.all(map(vdis, vdi => migrateVdi(vdi, sr))) + return Promise.all( + map(vdis, vdi => + migrateVdi( + vdi, + sr, + getDefined(() => resolvedResourceSet.id) + ) + ) + ) }, noop) + } _getIsVmAdmin = createSelector( () => this.props.checkPermissions,