feat(xo-web/console): add disabled console message (#7161)

Fixes #6319
This commit is contained in:
MlssFrncJrg
2023-11-21 10:39:35 +01:00
committed by GitHub
parent 4504141cbf
commit f3e0227c55
3 changed files with 13 additions and 7 deletions
+2 -1
View File
@@ -8,6 +8,7 @@
> Users must be able to say: “Nice enhancement, I'm eager to test it” > Users must be able to say: “Nice enhancement, I'm eager to test it”
- [Netbox] Ability to synchronize XO users as Netbox tenants (PR [#7158](https://github.com/vatesfr/xen-orchestra/pull/7158)) - [Netbox] Ability to synchronize XO users as Netbox tenants (PR [#7158](https://github.com/vatesfr/xen-orchestra/pull/7158))
- [VM/Console] Add a message to indicate that the console view has been [disabled](https://support.citrix.com/article/CTX217766/how-to-disable-the-console-for-the-vm-in-xencenter) for this VM [#6319](https://github.com/vatesfr/xen-orchestra/issues/6319) (PR [#7161](https://github.com/vatesfr/xen-orchestra/pull/7161))
### Bug fixes ### Bug fixes
@@ -42,6 +43,6 @@
- xo-server patch - xo-server patch
- xo-server-netbox minor - xo-server-netbox minor
- xo-vmdk-to-vhd patch - xo-vmdk-to-vhd patch
- xo-web patch - xo-web minor
<!--packages-end--> <!--packages-end-->
@@ -1200,6 +1200,7 @@ const messages = {
copyToClipboardLabel: 'Copy', copyToClipboardLabel: 'Copy',
ctrlAltDelButtonLabel: 'Ctrl+Alt+Del', ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
ctrlAltDelConfirmation: 'Send Ctrl+Alt+Del to VM?', ctrlAltDelConfirmation: 'Send Ctrl+Alt+Del to VM?',
disabledConsole: 'Console is disabled for this VM',
multilineCopyToClipboard: 'Multiline copy', multilineCopyToClipboard: 'Multiline copy',
tipLabel: 'Tip:', tipLabel: 'Tip:',
hideHeaderTooltip: 'Hide info', hideHeaderTooltip: 'Hide info',
+10 -6
View File
@@ -242,12 +242,16 @@ export default class TabConsole extends Component {
</Row> </Row>
<Row className='console'> <Row className='console'>
<Col> <Col>
<NoVnc {vm.other.disable_pv_vnc === '1' ? (
onClipboardChange={this._getRemoteClipboard} _('disabledConsole')
ref='noVnc' ) : (
scale={scale} <NoVnc
url={resolveUrl(`consoles/${vm.id}`)} onClipboardChange={this._getRemoteClipboard}
/> ref='noVnc'
scale={scale}
url={resolveUrl(`consoles/${vm.id}`)}
/>
)}
</Col> </Col>
</Row> </Row>
</Container> </Container>