Skip to content

novnc: Fix vm console is not working on firefox if language is not English #4833

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

Merged
yadvr merged 1 commit into from
Mar 17, 2021
Merged

novnc: Fix vm console is not working on firefox if language is not English #4833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,10 @@ private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO
if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
} else {
sb.append("/resource/noVNC/vnc.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token="
+ encryptor.encryptObject(ConsoleProxyClientParam.class, param));
sb.append("/resource/noVNC/vnc.html")
.append("?autoconnect=true")
.append("&port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT)
.append("&token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
}

// for console access, we need guest OS type to help implement keyboard
Expand Down
5 changes: 0 additions & 5 deletions systemvm/agent/noVNC/vnc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,4 @@ <h1 class="noVNC_logo" translate="no" style="display: none;"><span>no</span><br>
<source src="app/sounds/bell.mp3" type="audio/mpeg">
</audio>
</body>
<script type="application/javascript">
window.onload = function() {
document.getElementById("noVNC_connect_button").click();
}
</script>
</html>