fix(xo-web/vm/disks): fix "not enough permissions" error (#5299)

Introduced by 1116530a6b
This commit is contained in:
Rajaa.BARHTAOUI 2020-10-06 15:16:27 +02:00 committed by GitHub
parent 385984b1d8
commit 6ad7db522a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions

View File

@ -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)) - [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)) - [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 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 ### Packages to release

View File

@ -557,13 +557,14 @@ export default class TabDisks extends Component {
newDisk: false, newDisk: false,
}) })
_migrateVdis = vdis => _migrateVdis = vdis => {
confirm({ const { resolvedResourceSet, vm } = this.props
return confirm({
title: _('vdiMigrate'), title: _('vdiMigrate'),
body: ( body: (
<MigrateVdiModalBody <MigrateVdiModalBody
pool={this.props.vm.$pool} pool={vm.$pool}
resourceSet={this.props.resolvedResourceSet} resourceSet={resolvedResourceSet}
warningBeforeMigrate={this._getGenerateWarningBeforeMigrate()} warningBeforeMigrate={this._getGenerateWarningBeforeMigrate()}
/> />
), ),
@ -572,8 +573,17 @@ export default class TabDisks extends Component {
return error(_('vdiMigrateNoSr'), _('vdiMigrateNoSrMessage')) 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) }, noop)
}
_getIsVmAdmin = createSelector( _getIsVmAdmin = createSelector(
() => this.props.checkPermissions, () => this.props.checkPermissions,