F #3951: Fix problems with fireedge connections

Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges authored and Tino Vázquez committed 2020-12-15 17:11:33 +01:00
1 parent 37f73cdfab
commit cedde8b330
2 files changed
+9 -6

No files matched your search

@@ -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;
@@ -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();
}