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

B #5402: Fix Cloud View Remote connection options (#1226)

Browse Source 
(cherry picked from commit c9a3f9bc1f976102355a971da88797db0772cfdb)
This commit is contained in:
Frederick Borges 2021-05-19 10:37:31 +02:00 committed by Tino Vazquez
parent 22395fa397
commit 7d9e89756e
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
View File

@ -58,6 +58,12 @@
<div class="remote-logo-dropdown"><img src="images/remote_console/spice.png"/></div> SPICE
</a>
</li>
<!-- VMRC button -->
<li class="display-list margin-tlr-1">
<a href="#" class="provision_vmrc_button">
<div class="remote-logo-dropdown"><img src="images/remote_console/vmrc.png"/></div> VMRC
</a>
</li>
<!-- RDP button -->
<li class="display-list margin-tlr-1">
<a href="#" class="provision_rdp_button">

43
src/sunstone/public/app/tabs/provision-tab/vms/list.js
View File

@ -327,38 +327,43 @@ define(function(require) {
$(".provision_rdp_button", context).toggle(Boolean(OpenNebulaVM.isConnectionSupported(data, 'rdp')));
$(".provision_wfile_button", context).toggle(Boolean(OpenNebulaVM.isWFileSupported(data)));
if (OpenNebulaVM.isVNCSupported(data) && !is_fireedge_configured) {
$(".provision_vnc_button", context).parent().show();
}else{
$(".provision_vnc_button", context).parent().hide();
}
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);
if (OpenNebulaVM.isSPICESupported(data)) {
if (is_spice_allowed) {
$(".provision_spice_button", context).parent().show();
}else{
$(".provision_spice_button", context).parent().hide();
}
if (OpenNebulaVM.isVMRCSupported(data)) {
$(".provision_vmrc_button", context).parent().show();
}else{
$(".provision_vmrc_button", context).parent().hide();
}
if (OpenNebulaVM.isWFileSupported(data)) {
if (is_virt_viewer_allowed) {
$(".provision_wfile_button", context).parent().show();
}else{
$(".provision_wfile_button", context).parent().hide();
}
if (OpenNebulaVM.isVNCSupported(data) && is_fireedge_configured) {
$(".provision_guac_vnc_button", context).parent().show();
$(".provision_guac_rdp_button", context).parent().show();
$(".provision_guac_ssh_button", context).parent().show();
}else{
if (is_fireedge_configured){
$(".provision_vnc_button", context).parent().hide();
if (is_vmrc_allowed) {
$(".provision_vmrc_button", context).parent().show();
$(".provision_guac_vnc_button", context).parent().hide();
$(".provision_guac_rdp_button", context).parent().hide();
$(".provision_guac_ssh_button", context).parent().hide();
}else { // Guacamole connections
$(".provision_vmrc_button", context).parent().hide();
$(".provision_guac_vnc_button", context).parent().show();
$(".provision_guac_rdp_button", context).parent().show();
$(".provision_guac_ssh_button", context).parent().show();
}
}
else{
$(".provision_vnc_button", context).parent().show();
$(".provision_vmrc_button", context).parent().hide();
$(".provision_guac_vnc_button", context).parent().hide();
$(".provision_guac_rdp_button", context).parent().hide();
$(".provision_guac_ssh_button", context).parent().hide();
$(".provision_guac_ssh_button", context).parent().hide();
}
$(".provision_info_vm", context).attr("vm_id", data.ID);