From 0c87dee31cb76f9a4bf76fa6c7730a5d924fd432 Mon Sep 17 00:00:00 2001 From: Pierre Donias Date: Wed, 27 Oct 2021 16:59:59 +0200 Subject: [PATCH] fix(xo-web/xoa): handle string expiration dates (#5967) See xoa-support#4114 See xoa-support#4192 www-xo may return a string instead of a number in some rare cases --- CHANGELOG.unreleased.md | 1 + packages/xo-web/src/xo-app/xoa/licenses/index.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index cbb008064..e6fd73262 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -21,6 +21,7 @@ - [Netbox] Fix error when testing plugin on versions older than 2.10 (PR [#5963](https://github.com/vatesfr/xen-orchestra/pull/5963)) - [Snapshot] Fix "Create VM from snapshot" creating a template instead of a VM (PR [#5955](https://github.com/vatesfr/xen-orchestra/pull/5955)) - [Host/Logs] Improve the display of log content (PR [#5943](https://github.com/vatesfr/xen-orchestra/pull/5943)) +- [XOA licenses] Fix expiration date displaying "Invalid date" in some rare cases (PR [#5967](https://github.com/vatesfr/xen-orchestra/pull/5967)) ### Packages to release diff --git a/packages/xo-web/src/xo-app/xoa/licenses/index.js b/packages/xo-web/src/xo-app/xoa/licenses/index.js index fa0a971f2..0c2068915 100644 --- a/packages/xo-web/src/xo-app/xoa/licenses/index.js +++ b/packages/xo-web/src/xo-app/xoa/licenses/index.js @@ -139,7 +139,7 @@ const PRODUCTS_COLUMNS = [ }, { name: _('licenseExpires'), - itemRenderer: ({ expires }) => (expires !== undefined ? : '-'), + itemRenderer: ({ expires }) => (expires !== undefined ? : '-'), sortCriteria: 'expires', sortOrder: 'desc', },