apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei Zhou 2021-03-17 13:10:42 +01:00 committed by GitHub
parent a291dea26a
commit 4c88021f81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -495,8 +495,10 @@ public class ConsoleProxyServlet extends HttpServlet {
if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) { if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param)); sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
} else { } else {
sb.append("/resource/noVNC/vnc.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token=" sb.append("/resource/noVNC/vnc.html")
+ encryptor.encryptObject(ConsoleProxyClientParam.class, param)); .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 // for console access, we need guest OS type to help implement keyboard

5
systemvm/agent/noVNC/vnc.html
View File

@ -333,9 +333,4 @@
<source src="app/sounds/bell.mp3" type="audio/mpeg"> <source src="app/sounds/bell.mp3" type="audio/mpeg">
</audio> </audio>
</body> </body>
<script type="application/javascript">
window.onload = function() {
document.getElementById("noVNC_connect_button").click();
}
</script>
</html> </html>