M #~: Fix conditions to start vms remote connections

OpenNebula · Jun 3, 2020 · 9319a0a · 9319a0a · GitCop · Jun 3, 2020
1 parent a4d7beb
commit 9319a0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js
@@ -319,7 +319,7 @@ define(function(require) {
     $(".spice", context).on("click", function() {
       var data = $(this).data();
 
-      if (!Spice.lockStatus() && data.id) {
+      if (!Spice.lockStatus() && data.hasOwnProperty("id")) {
         Spice.lock();
         Sunstone.runAction("VM.startspice_action", String(data.id));
       } else {
@@ -333,10 +333,10 @@ define(function(require) {
     $(".w_file", context).on("click", function() {
       var data = $(this).data();
 
-      (data.id && data.hostname && data.type && data.port)
+      (data.hasOwnProperty("id") && data.hasOwnProperty("hostname") && data.hasOwnProperty("type") && data.hasOwnProperty("port"))
         ? Sunstone.runAction(
           "VM.save_virt_viewer_action",
-          data.id,
+          String(data.id),
           { hostname: data.hostname, type: data.type, port: data.port }
         )
         : Notifier.notifyError(Locale.tr("Data for virt-viewer file isn't correct"));
@@ -348,7 +348,7 @@ define(function(require) {
     $(".vnc", context).on("click", function() {
       var data = $(this).data();
 
-      if (!Vnc.lockStatus() && data.id) {
+      if (!Vnc.lockStatus() && data.hasOwnProperty("id")) {
         Vnc.lock();
         Sunstone.runAction("VM.startvnc_action", String(data.id));
       } else {
@@ -362,7 +362,7 @@ define(function(require) {
     $(".rdp", context).on("click", function() {
       var data = $(this).data();
 
-      (data.ip && data.name)
+      (data.hasOwnProperty("ip") && data.hasOwnProperty("name"))
         ? Sunstone.runAction("VM.save_rdp", data)
         : Notifier.notifyError(Locale.tr("This VM needs a nic with rdp active"));
 

diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable.js b/src/sunstone/public/app/tabs/vms-tab/datatable.js
@@ -178,10 +178,10 @@ define(function(require) {
     $('#' + this.dataTableId).on("click", '.w_file', function(){
       var data = $(this).data();
 
-      (data.id && data.hostname && data.type && data.port)
+      (data.hasOwnProperty("id") && data.hasOwnProperty("hostname") && data.hasOwnProperty("type") && data.hasOwnProperty("port"))
         ? Sunstone.runAction(
           "VM.save_virt_viewer_action",
-          data.id,
+          String(data.id),
           { hostname: data.hostname, type: data.type, port: data.port }
         )
         : Notifier.notifyError(Locale.tr("Data for virt-viewer file isn't correct"));
@@ -193,7 +193,7 @@ define(function(require) {
     $('#' + this.dataTableId).on("click", '.rdp', function() {
       var data = $(this).data();
 
-      (data.ip && data.name)
+      (data.hasOwnProperty("ip") && data.hasOwnProperty("name"))
         ? Sunstone.runAction("VM.save_rdp", data)
         : Notifier.notifyError(Locale.tr("This VM needs a nic with rdp active"));
 
@@ -203,9 +203,9 @@ define(function(require) {
     $('#' + this.dataTableId).on("click", '.vnc', function() {
       var data = $(this).data();
 
-      if (!Vnc.lockStatus()) {
+      if (!Vnc.lockStatus() && data.hasOwnProperty("id")) {
         Vnc.lock();
-        Sunstone.runAction("VM.startvnc_action", data.id);
+        Sunstone.runAction("VM.startvnc_action", String(data.id));
       } else {
         Notifier.notifyError(Locale.tr("VNC Connection in progress"));
       }
@@ -216,9 +216,9 @@ define(function(require) {
     $('#' + this.dataTableId).on("click", '.spice', function() {
       var data = $(this).data();
 
-      if (!Spice.lockStatus() && data.id) {
+      if (!Spice.lockStatus() && data.hasOwnProperty("id")) {
         Spice.lock();
-        Sunstone.runAction("VM.startspice_action", data.id);
+        Sunstone.runAction("VM.startspice_action", String(data.id));
       } else {
         Notifier.notifyError(Locale.tr("SPICE Connection in progress"))
       }