shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

Bug 3428 (#3429)

Browse Source 
* B #3428: fix bug lost icons VNC in federation

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>

* B #3428: fix bug lost icons VNC in federation

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>

* B #3428: fix bug lost icons VNC in federation

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Lobo 2019-06-14 17:23:01 +02:00 committed by Tino Vázquez
parent f852bc6ead
commit e92280d8bc
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sunstone/public/app/tabs/vms-tab/hooks/state.js
View File

@ -53,8 +53,14 @@ define(function(require) {
} else {
$(".spice-sunstone-info").hide();
}
if (config["federation_mode"] == "SLAVE") {
if(config &&
config["system_config"] &&
config["system_config"]["allow_vnc_federation"] &&
config["system_config"]["allow_vnc_federation"] === 'no' &&
config["id_own_federation"] &&
config["zone_id"] &&
config["id_own_federation"] !== config["zone_id"])
{
$(".vnc-sunstone-info").hide();
}
}

9
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -70,7 +70,14 @@ define(function(require) {
} else {
vncIcon = '';
}
if (config["federation_mode"] == "SLAVE") {
if(config &&
config["system_config"] &&
config["system_config"]["allow_vnc_federation"] &&
config["system_config"]["allow_vnc_federation"] === 'no' &&
config["id_own_federation"] &&
config["zone_id"] &&
config["id_own_federation"] !== config["zone_id"])
{
vncIcon = '';
}

3
src/sunstone/sunstone-server.rb
View File

@ -392,9 +392,8 @@ helpers do
zone.info
session[:zone_name] = zone.name
session[:zone_id] = zone.id
session[:federation_mode] = rc['FEDERATION/MODE'].upcase
session[:id_own_federation] = rc['FEDERATION/ZONE_ID']
session[:mode] = $conf[:mode]
return [204, ""]

4
src/sunstone/views/index.erb
View File

@ -44,6 +44,7 @@
'vnc_request_password' : <%= $conf[:vnc_request_password] || false %>,
'vnc_proxy_port' : '<%= $vnc.proxy_port %>',
'vnc_client_port' : '<%= $conf[:vnc_client_port] %>',
'allow_vnc_federation' : '<%= (!$conf[:allow_vnc_federation].nil?)? $conf[:allow_vnc_federation] : "no" %>',
'max_upload_file_size' : <%= $conf[:max_upload_file_size] ? $conf[:max_upload_file_size] : "undefined" %>
},
'view' : view,
@ -56,7 +57,8 @@
'zone_name' : '<%= session[:zone_name] %>',
'zone_id' : '<%= session[:zone_id] %>',
'federation_mode' : '<%= session[:federation_mode] %>',
'vm_logos' : <%= logos_conf.to_json %>,
'id_own_federation' : '<%= session[:id_own_federation] %>',
'vm_logos' : <%= logos_conf.to_json %>,
'oned_conf' : <%= oned_conf.to_json %>,
'support' : <%= support.to_json %>,
'upgrade' : <%= upgrade.to_json %>,