diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 6adc5d116..bdc3d1ec2 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -8,6 +8,7 @@ - [Plugins] Display number of installed plugins [#4008](https://github.com/vatesfr/xen-orchestra/issues/4008) (PR [#4050](https://github.com/vatesfr/xen-orchestra/pull/4050)) - [Continuous Replication] Opt-in mode to guess VHD size, should help with XenServer 7.1 CU2 and various `VDI_IO_ERROR` errors (PR [#3726](https://github.com/vatesfr/xen-orchestra/pull/3726)) - [VM/Snapshots] Always delete broken quiesced snapshots [#4074](https://github.com/vatesfr/xen-orchestra/issues/4074) (PR [#4075](https://github.com/vatesfr/xen-orchestra/pull/4075)) +- [Settings/Servers] Display link to pool [#4041](https://github.com/vatesfr/xen-orchestra/issues/4041) (PR [#4045](https://github.com/vatesfr/xen-orchestra/pull/4045)) ### Bug fixes diff --git a/packages/xo-server/src/xo-mixins/xen-servers.js b/packages/xo-server/src/xo-mixins/xen-servers.js index 082383a5b..c4aabebc2 100644 --- a/packages/xo-server/src/xo-mixins/xen-servers.js +++ b/packages/xo-server/src/xo-mixins/xen-servers.js @@ -459,8 +459,8 @@ export default class { const xapis = this._xapis forEach(servers, server => { server.status = this._getXenServerStatus(server.id) - if (server.status === 'connected' && server.label === undefined) { - server.label = xapis[server.id].pool.name_label + if (server.status === 'connected') { + server.poolId = xapis[server.id].pool.uuid } // Do not expose password. diff --git a/packages/xo-web/src/xo-app/settings/servers/index.js b/packages/xo-web/src/xo-app/settings/servers/index.js index 2fe151f21..f51b7f934 100644 --- a/packages/xo-web/src/xo-app/settings/servers/index.js +++ b/packages/xo-web/src/xo-app/settings/servers/index.js @@ -11,6 +11,7 @@ import { alert, confirm } from 'modal' import { Container } from 'grid' import { Password as EditablePassword, Text } from 'editable' import { Password, Toggle } from 'form' +import { Pool } from 'render-xo-item' import { injectIntl } from 'react-intl' import { noop } from 'lodash' import { @@ -155,6 +156,11 @@ const COLUMNS = [ ), sortCriteria: _ => !!_.allowUnauthorized, }, + { + itemRenderer: ({ poolId }) => + poolId !== undefined && , + name: _('pool'), + }, ] const INDIVIDUAL_ACTIONS = [ {