From 107f19108d31474c3f9665f6caae10c839c4a34c Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Tue, 25 May 2021 17:23:50 +0200 Subject: [PATCH] B #~: Fix remote connections options (#1245) (cherry picked from commit aaf07b088a2232dac36b5449b93e626ae5e2cf00) --- src/sunstone/public/app/tabs/provision-tab/vms/list.js | 9 ++++----- src/sunstone/public/app/tabs/vms-tab/hooks/state.js | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js index 37e86a70c3..31aec856cc 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js @@ -325,13 +325,12 @@ define(function(require) { } $(".provision_rdp_button", context).toggle(Boolean(OpenNebulaVM.isConnectionSupported(data, 'rdp'))); - $(".provision_wfile_button", context).toggle(Boolean(OpenNebulaVM.isWFileSupported(data))); var state = get_provision_vm_state(data); - var is_vnc_allowed = OpenNebulaVM.isVNCSupported(data); - var is_spice_allowed = OpenNebulaVM.isSPICESupported(data); - var is_vmrc_allowed = OpenNebulaVM.isVMRCSupported(data); - var is_virt_viewer_allowed = OpenNebulaVM.isWFileSupported(data); + var is_vnc_allowed = Boolean(OpenNebulaVM.isVNCSupported(data)); + var is_spice_allowed = Boolean(OpenNebulaVM.isSPICESupported(data)); + var is_vmrc_allowed = Boolean(OpenNebulaVM.isVMRCSupported(data)); + var is_virt_viewer_allowed = Boolean(OpenNebulaVM.isWFileSupported(data)); var is_rdp_allowed = Boolean(OpenNebulaVM.isConnectionSupported(data, 'rdp')); var is_ssh_allowed = Boolean(OpenNebulaVM.isConnectionSupported(data, 'ssh')); diff --git a/src/sunstone/public/app/tabs/vms-tab/hooks/state.js b/src/sunstone/public/app/tabs/vms-tab/hooks/state.js index 0918e2a795..a1af0d1fc9 100644 --- a/src/sunstone/public/app/tabs/vms-tab/hooks/state.js +++ b/src/sunstone/public/app/tabs/vms-tab/hooks/state.js @@ -74,8 +74,8 @@ define(function(require) { } var sshAndRdpController = function(){ - $('.rdp-guac-button').toggle(isRDPSupported); - $('.ssh-guac-button').toggle(isSSHSupported); + $('.guac-rdp-button').toggle(isRDPSupported); + $('.guac-ssh-button').toggle(isSSHSupported); } vncAndSpiceController(); @@ -121,7 +121,7 @@ define(function(require) { var show_fireedge_buttons = function() { $(".vnc-button").hide(); $(".vmrc-button").toggle(isVMRCSupported); - $(".vnc-guac-button").toggle(isVNCSupported); + $(".guac-vnc-button").toggle(!isVMRCSupported); sshAndRdpController(); }