NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-web/proxies): ignore running jobs on force upgrade

Browse Source 
See #3527
This commit is contained in:
Julien Fontanet 2021-03-22 14:37:34 +01:00
parent 32d0606ee4
commit a4d90e8aff
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.unreleased.md
View File

@ -11,6 +11,8 @@
> Users must be able to say: “I had this issue, happy to know it's fixed” > Users must be able to say: “I had this issue, happy to know it's fixed”
- [Proxy] _Force upgrade_ no longer fails on broken proxy
### Packages to release ### Packages to release
> Packages will be released in the order they are here, therefore, they should > Packages will be released in the order they are here, therefore, they should
@ -27,3 +29,5 @@
> - major: if the change breaks compatibility > - major: if the change breaks compatibility
> >
> In case of conflict, the highest (lowest in previous list) `$version` wins. > In case of conflict, the highest (lowest in previous list) `$version` wins.
- xo-web patch

2
packages/xo-web/src/xo-app/proxies/index.js
View File

@ -78,7 +78,7 @@ const INDIVIDUAL_ACTIONS = [
{ {
collapsed: true, collapsed: true,
disabled: ({ vmUuid }) => vmUuid === undefined, disabled: ({ vmUuid }) => vmUuid === undefined,
handler: (proxy, { upgradeAppliance }) => upgradeAppliance(proxy.id), handler: (proxy, { upgradeAppliance }) => upgradeAppliance(proxy.id, { ignoreRunningJobs: true }),
icon: 'upgrade', icon: 'upgrade',
label: _('forceUpgrade'), label: _('forceUpgrade'),
level: 'primary', level: 'primary',