shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

F #3951: Fix problems with fireedge connections

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges 2020-12-15 16:25:09 +01:00 committed by Tino Vázquez
parent 37f73cdfab
commit cedde8b330
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/tabs/vms-tab/datatable.js
View File

@ -284,8 +284,8 @@ define(function(require) {
: Notifier.notifyError(Locale.tr("VNC - Invalid action"));
}
var remote_connections = function(){
if (FireedgeValidator.fireedgeToken != ""){
var remote_connections = function(fireedgeToken){
if (fireedgeToken != ""){
var data = $(that).data();
// Get VM info
if (data.hasOwnProperty('id')){
@ -304,11 +304,11 @@ define(function(require) {
}
}
if (fireedgeToken == "") {
if (FireedgeValidator.fireedgeToken == "") {
FireedgeValidator.validateFireedgeToken(remote_connections, callVNC);
}
else{
remote_connections();
remote_connections(FireedgeValidator.fireedgeToken);
}
return false;

7
src/sunstone/public/app/tabs/vms-tab/panels/info.js
View File

@ -176,7 +176,7 @@ define(function(require) {
TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, unshownValues, strippedTemplate);
var show_buttons = function(){
if (FireedgeValidator.fireedgeToken != ""){
if (fireedge_token != ""){
$(".vnc-button").hide();
if(that && that.element && that.element.USER_TEMPLATE && that.element.USER_TEMPLATE.HYPERVISOR){
if (that.element.USER_TEMPLATE.HYPERVISOR == "vcenter"){
@ -188,10 +188,13 @@ define(function(require) {
$(".vmrc-button").hide();
}
}
else{
$(".guac-button").show();
$(".vmrc-button").hide();
}
}
else{
$(".vnc-button").show();
// Verify hipervisor
$(".guac-button").hide();
$(".vmrc-button").hide();
}