From 85428fa72e0218bf1138c3b00a6fb8df21e12a7d Mon Sep 17 00:00:00 2001 From: Pierre Donias Date: Wed, 22 Apr 2020 14:18:59 +0200 Subject: [PATCH] fix(xo-web/xoa): always allow users to manage the XOA (#4941) --- CHANGELOG.unreleased.md | 1 + packages/xo-web/src/xo-app/index.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 2a2c8f220..b5cf40e16 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -19,6 +19,7 @@ - [Patches] Hide patch `CH81` (upgrade patch) from the pool patches (PR [#4942](https://github.com/vatesfr/xen-orchestra/pull/4942)) - [Proxy] Fix some `operation timed out` errors on (re)deploy [#4927](https://github.com/vatesfr/xen-orchestra/issues/4927) (PR [#4928](https://github.com/vatesfr/xen-orchestra/pull/4928)) - [Backup] Fix some `cannot get the proxy VM IP` errors on backup's execution [#4927](https://github.com/vatesfr/xen-orchestra/issues/4927) (PR [#4928](https://github.com/vatesfr/xen-orchestra/pull/4928)) +- [XOA] Allow to access the license page when a XOA trial has ended (PR [#4941](https://github.com/vatesfr/xen-orchestra/pull/4941)) ### Released packages diff --git a/packages/xo-web/src/xo-app/index.js b/packages/xo-web/src/xo-app/index.js index 7e74b3435..6851e4ed1 100644 --- a/packages/xo-web/src/xo-app/index.js +++ b/packages/xo-web/src/xo-app/index.js @@ -217,7 +217,11 @@ export default class XoApp extends Component { render() { const { signedUp, trial, registerNeeded } = this.props - const blocked = signedUp && blockXoaAccess(trial) // If we are under expired or unstable trial (signed up only) + // If we are under expired or unstable trial (signed up only) + const blocked = + signedUp && + blockXoaAccess(trial) && + !this.context.router.location.pathname.startsWith('/xoa/') const plan = getXoaPlan() return (