diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index a901eb316..2330f2729 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -24,6 +24,7 @@ - [Tasks] Fix tasks being displayed for all users (PR [#6422](https://github.com/vatesfr/xen-orchestra/pull/6422)) - [Storage/advanced] Fix the display of VDI to coalesce [#6334](https://xcp-ng.org/forum/topic/6334/coalesce-not-showing-anymore) (PR [#6429](https://github.com/vatesfr/xen-orchestra/pull/6429)) - [Backup] Ignore disabled remotes instead of failing the execution [#6347](https://github.com/vatesfr/xen-orchestra/issues/6374) (PR [#6430](https://github.com/vatesfr/xen-orchestra/pull/6430)) +- [Home/VMs] Fix VMs being deleted despite clicking on Cancel in the bulk deletion modal (PR [#6435](https://github.com/vatesfr/xen-orchestra/pull/6435)) ### Packages to release diff --git a/packages/xo-web/src/common/xo/index.js b/packages/xo-web/src/common/xo/index.js index 2aba97647..490dac350 100644 --- a/packages/xo-web/src/common/xo/index.js +++ b/packages/xo-web/src/common/xo/index.js @@ -1618,14 +1618,18 @@ export const deleteVms = async vms => { if (vms.length === 1) { return deleteVm(vms[0]) } - await confirm({ - title: _('deleteVmsModalTitle', { vms: vms.length }), - body: _('deleteVmsModalMessage', { vms: vms.length }), - strongConfirm: vms.length > 1 && { - messageId: 'deleteVmsConfirmText', - values: { nVms: vms.length }, - }, - }).catch(noop) + try { + await confirm({ + title: _('deleteVmsModalTitle', { vms: vms.length }), + body: _('deleteVmsModalMessage', { vms: vms.length }), + strongConfirm: vms.length > 1 && { + messageId: 'deleteVmsConfirmText', + values: { nVms: vms.length }, + }, + }) + } catch (err) { + return + } let nErrors = 0 await Promise.all(