Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Nov 21, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4314a
feat(xo-web/console): added deactivated console message
Pizzosaure Nov 7, 2023
1a550b8
Merge branch 'master' into consoleTabMessage
pdonias Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
> 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))
- [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

Expand Down Expand Up @@ -42,6 +43,6 @@
- xo-server patch
- xo-server-netbox minor
- xo-vmdk-to-vhd patch
- xo-web patch
- xo-web minor

<!--packages-end-->
1 change: 1 addition & 0 deletions packages/xo-web/src/common/intl/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ const messages = {
copyToClipboardLabel: 'Copy',
ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
ctrlAltDelConfirmation: 'Send Ctrl+Alt+Del to VM?',
disabledConsole: 'Console is disabled for this VM',
multilineCopyToClipboard: 'Multiline copy',
tipLabel: 'Tip:',
hideHeaderTooltip: 'Hide info',
Expand Down
16 changes: 10 additions & 6 deletions packages/xo-web/src/xo-app/vm/tab-console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,16 @@ export default class TabConsole extends Component {
</Row>
<Row className='console'>
<Col>
<NoVnc
onClipboardChange={this._getRemoteClipboard}
ref='noVnc'
scale={scale}
url={resolveUrl(`consoles/${vm.id}`)}
/>
{vm.other.disable_pv_vnc === '1' ? (
_('disabledConsole')
) : (
<NoVnc
onClipboardChange={this._getRemoteClipboard}
ref='noVnc'
scale={scale}
url={resolveUrl(`consoles/${vm.id}`)}
/>
)}
</Col>
</Row>
</Container>
Expand Down