diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 46debf9ba4b..b4299149aa2 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -13,6 +13,8 @@ > Users must be able to say: “I had this issue, happy to know it's fixed” +- [Backup/Restore] Fix `Cannot read properties of undefined (reading 'id')` error when restoring via an XO Proxy (PR [#7026](https://github.com/vatesfr/xen-orchestra/pull/7026)) + ### Packages to release > When modifying a package, add it here with its release type. @@ -29,6 +31,7 @@ +- xo-server patch - xo-server-netbox minor diff --git a/packages/xo-server/src/_handleBackupLog.mjs b/packages/xo-server/src/_handleBackupLog.mjs index 52d9da4f775..05fa21f25b5 100644 --- a/packages/xo-server/src/_handleBackupLog.mjs +++ b/packages/xo-server/src/_handleBackupLog.mjs @@ -41,7 +41,7 @@ function forwardResult(log) { // it records logs generated by `@xen-orchestra/backups/Task#run` export const handleBackupLog = ( log, - { vmBackupInfo, app, jobName, logger, localTaskIds, rootTaskId, runJobId = rootTaskId, handleRootTaskId } + { vmBackupInfo, app, jobName, logger, localTaskIds, rootTaskId, runJobId, handleRootTaskId } ) => { const { event, message, parentId, taskId } = log diff --git a/packages/xo-server/src/xo-mixins/backups-ng/index.mjs b/packages/xo-server/src/xo-mixins/backups-ng/index.mjs index 25f30ba0a3b..67b4325d62b 100644 --- a/packages/xo-server/src/xo-mixins/backups-ng/index.mjs +++ b/packages/xo-server/src/xo-mixins/backups-ng/index.mjs @@ -496,6 +496,7 @@ export default class BackupNg { this._runningRestores.add(id) rootTaskId = id }, + rootTaskId, }) } } catch (error) {