Skip to content

Commit

Permalink
fix(xo-web): handle missing result of broken merge tasks in backup lo…
Browse files Browse the repository at this point in the history
…gs (#6275)
  • Loading branch information
fbeauchamp committed Jun 9, 2022
1 parent 32a4744 commit 05a96ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
- xo-cli minor
- @xen-orchestra/xapi minor
- xo-server minor
- xo-web patch

<!--packages-end-->
4 changes: 2 additions & 2 deletions packages/xo-web/src/xo-app/logs/backup-ng/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ const COLUMNS = [
return
}
if (operationTask.message === 'transfer' && vmTransferSize === undefined) {
vmTransferSize = operationTask.result.size
vmTransferSize = operationTask.result?.size
}
if (operationTask.message === 'merge' && vmMergeSize === undefined) {
vmMergeSize = operationTask.result.size
vmMergeSize = operationTask.result?.size
}

if (vmTransferSize !== undefined && vmMergeSize !== undefined) {
Expand Down

0 comments on commit 05a96ff

Please sign in to comment.