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

feat(xo-web, xo-server): display link to pool (#4045)

Browse Source 
Fixes #4041
This commit is contained in:
Enishowk 2019-03-28 15:42:37 +01:00 committed by Pierre Donias
parent 4052f7f736
commit f49910ca82
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.unreleased.md
View File

@ -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)) - [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)) - [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)) - [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 ### Bug fixes

4
packages/xo-server/src/xo-mixins/xen-servers.js
View File

@ -459,8 +459,8 @@ export default class {
const xapis = this._xapis const xapis = this._xapis
forEach(servers, server => { forEach(servers, server => {
server.status = this._getXenServerStatus(server.id) server.status = this._getXenServerStatus(server.id)
if (server.status === 'connected' && server.label === undefined) { if (server.status === 'connected') {
server.label = xapis[server.id].pool.name_label server.poolId = xapis[server.id].pool.uuid
} }
// Do not expose password. // Do not expose password.

6
packages/xo-web/src/xo-app/settings/servers/index.js
View File

@ -11,6 +11,7 @@ import { alert, confirm } from 'modal'
import { Container } from 'grid' import { Container } from 'grid'
import { Password as EditablePassword, Text } from 'editable' import { Password as EditablePassword, Text } from 'editable'
import { Password, Toggle } from 'form' import { Password, Toggle } from 'form'
import { Pool } from 'render-xo-item'
import { injectIntl } from 'react-intl' import { injectIntl } from 'react-intl'
import { noop } from 'lodash' import { noop } from 'lodash'
import { import {
@ -155,6 +156,11 @@ const COLUMNS = [
), ),
sortCriteria: _ => !!_.allowUnauthorized, sortCriteria: _ => !!_.allowUnauthorized,
}, },
{
itemRenderer: ({ poolId }) =>
poolId !== undefined && <Pool id={poolId} link />,
name: _('pool'),
},
] ]
const INDIVIDUAL_ACTIONS = [ const INDIVIDUAL_ACTIONS = [
{ {