shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-14 01:57:24 +03:00
Code Releases Wiki Activity

F #4994: Add vm name to vnc window (#742)

Browse Source
This commit is contained in:
Sergio Betanzos 2021-02-02 18:57:58 +01:00 committed by GitHub
parent d5a6e24d1a
commit 8016b9b872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sunstone/public/app/console/vnc.js
View File

@ -19,6 +19,7 @@ define(function(require) {
var Config = require("sunstone-config");
var _rfb;
var _is_encrypted = "";
var _vm_name;
function setStatus(message="", status=""){
$(".NOVNC_message").text(message);
@ -26,12 +27,12 @@ define(function(require) {
}
function connected(){
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + _rfb._fb_name);
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + (_vm_name || _rfb._fb_name));
}
function disconnectedFromServer(e){
if (e.detail.clean) {
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + _rfb._fb_name);
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + (_vm_name || _rfb._fb_name));
} else {
setStatus("Something went wrong, connection is closed", "Failed");
}
@ -39,7 +40,7 @@ define(function(require) {
function desktopNameChange(e) {
if (e.detail.name) {
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + e.detail.name);
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + (_vm_name || e.detail.name));
}
}
@ -132,6 +133,7 @@ define(function(require) {
var proxy_port = Config.vncProxyPort;
var token = getQueryVariable("token");
var password = getQueryVariable("password");
_vm_name = getQueryVariable("title") || undefined;
var rfbConfig = password? { "credentials": { "password": password } } : {};

7
src/sunstone/public/app/utils/vnc.js
View File

@ -22,6 +22,7 @@ define(function(require) {
var _message = "";
var _status = "Loading";
var _is_encrypted = "";
var _vm_name;
return {
"lockStatus": lockStatus,
@ -52,12 +53,12 @@ define(function(require) {
}
function connected(){
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + _rfb._fb_name);
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + (_vm_name || _rfb._fb_name));
}
function disconnectedFromServer(e){
if (e.detail.clean) {
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + _rfb._fb_name);
setStatus(null, "VNC " + _rfb._rfb_connection_state + " (" + _is_encrypted + ") to: " + (_vm_name || _rfb._fb_name));
} else {
setStatus("Something went wrong, connection is closed", "Failed");
}
@ -79,7 +80,7 @@ define(function(require) {
var proxy_port = Config.vncProxyPort;
var pw = response["password"];
var token = response["token"];
var vm_name = response["vm_name"];
var vm_name = _vm_name = response["vm_name"];
var protocol = window.location.protocol;
var hostname = window.location.hostname;
var port = window.location.port;