fix(xo-web/pool/advanced): show backup/migration network even when deleted (#7303)
This commit is contained in:
parent
89a4de5b21
commit
0f1f45953c
@ -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”
|
||||||
|
|
||||||
|
- [Pool/Advanced] Show pool backup/migration network even if they no longer exist (PR [#7303](https://github.com/vatesfr/xen-orchestra/pull/7303))
|
||||||
|
|
||||||
### Packages to release
|
### Packages to release
|
||||||
|
|
||||||
> When modifying a package, add it here with its release type.
|
> When modifying a package, add it here with its release type.
|
||||||
@ -27,4 +29,6 @@
|
|||||||
|
|
||||||
<!--packages-start-->
|
<!--packages-start-->
|
||||||
|
|
||||||
|
- xo-web minor
|
||||||
|
|
||||||
<!--packages-end-->
|
<!--packages-end-->
|
||||||
|
@ -903,6 +903,7 @@ const messages = {
|
|||||||
// ----- Pool advanced tab -----
|
// ----- Pool advanced tab -----
|
||||||
backupNetwork: 'Backup network',
|
backupNetwork: 'Backup network',
|
||||||
crashDumpSr: 'Crash dump SR',
|
crashDumpSr: 'Crash dump SR',
|
||||||
|
defaultMigrationNetwork: 'Default migration network',
|
||||||
poolEditAll: 'Edit all',
|
poolEditAll: 'Edit all',
|
||||||
poolHaStatus: 'High Availability',
|
poolHaStatus: 'High Availability',
|
||||||
poolHaEnabled: 'Enabled',
|
poolHaEnabled: 'Enabled',
|
||||||
@ -921,9 +922,9 @@ const messages = {
|
|||||||
|
|
||||||
setpoolMaster: 'Master',
|
setpoolMaster: 'Master',
|
||||||
syslogRemoteHost: 'Remote syslog host',
|
syslogRemoteHost: 'Remote syslog host',
|
||||||
defaultMigrationNetwork: 'Default migration network',
|
|
||||||
syncNetbox: 'Synchronize with Netbox',
|
syncNetbox: 'Synchronize with Netbox',
|
||||||
syncNetboxWarning: 'Are you sure you want to synchronize with Netbox?',
|
syncNetboxWarning: 'Are you sure you want to synchronize with Netbox?',
|
||||||
|
updateMissingNetwork: '{networkID} not found, please select a new one',
|
||||||
// ----- Pool host tab -----
|
// ----- Pool host tab -----
|
||||||
hostNameLabel: 'Name',
|
hostNameLabel: 'Name',
|
||||||
hostDescription: 'Description',
|
hostDescription: 'Description',
|
||||||
|
@ -4,6 +4,7 @@ import _, { messages } from 'intl'
|
|||||||
import ActionButton from 'action-button'
|
import ActionButton from 'action-button'
|
||||||
import ActionRowButton from 'action-row-button'
|
import ActionRowButton from 'action-row-button'
|
||||||
import Component from 'base-component'
|
import Component from 'base-component'
|
||||||
|
import Copiable from 'copiable'
|
||||||
import Icon from 'icon'
|
import Icon from 'icon'
|
||||||
import renderXoItem, { Network, Sr } from 'render-xo-item'
|
import renderXoItem, { Network, Sr } from 'render-xo-item'
|
||||||
import SelectFiles from 'select-files'
|
import SelectFiles from 'select-files'
|
||||||
@ -452,13 +453,22 @@ export default class TabAdvanced extends Component {
|
|||||||
value={migrationNetwork}
|
value={migrationNetwork}
|
||||||
xoType='network'
|
xoType='network'
|
||||||
>
|
>
|
||||||
{migrationNetwork !== undefined ? <Network id={migrationNetwork.id} /> : _('noValue')}
|
{pool.otherConfig['xo:migrationNetwork'] === undefined ? (
|
||||||
</XoSelect>{' '}
|
_('noValue')
|
||||||
{migrationNetwork !== undefined && (
|
) : migrationNetwork !== undefined ? (
|
||||||
<a role='button' onClick={this._removeMigrationNetwork}>
|
<Network id={migrationNetwork.id} />
|
||||||
<Icon icon='remove' />
|
) : (
|
||||||
</a>
|
<span className='text-danger'>
|
||||||
|
{_('updateMissingNetwork', {
|
||||||
|
networkID: (
|
||||||
|
<Copiable data={pool.otherConfig['xo:migrationNetwork']}>
|
||||||
|
<strong>{pool.otherConfig['xo:migrationNetwork']}</strong>
|
||||||
|
</Copiable>
|
||||||
|
),
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
|
</XoSelect>{' '}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@ -470,13 +480,22 @@ export default class TabAdvanced extends Component {
|
|||||||
value={backupNetwork}
|
value={backupNetwork}
|
||||||
xoType='network'
|
xoType='network'
|
||||||
>
|
>
|
||||||
{backupNetwork !== undefined ? <Network id={backupNetwork.id} /> : _('noValue')}
|
{pool.otherConfig['xo:backupNetwork'] === undefined ? (
|
||||||
</XoSelect>{' '}
|
_('noValue')
|
||||||
{backupNetwork !== undefined && (
|
) : backupNetwork !== undefined ? (
|
||||||
<a role='button' onClick={this._removeBackupNetwork}>
|
<Network id={backupNetwork.id} />
|
||||||
<Icon icon='remove' />
|
) : (
|
||||||
</a>
|
<span className='text-danger'>
|
||||||
|
{_('updateMissingNetwork', {
|
||||||
|
networkID: (
|
||||||
|
<Copiable data={pool.otherConfig['xo:backupNetwork']}>
|
||||||
|
<strong>{pool.otherConfig['xo:backupNetwork']}</strong>
|
||||||
|
</Copiable>
|
||||||
|
),
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
|
</XoSelect>{' '}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
Loading…
Reference in New Issue
Block a user