From e7b6fe45d683c40fbf0b68722f3ee58912f70de2 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 23 Nov 2012 16:59:35 +0100 Subject: [PATCH 1/2] bug #1628: VNC button active in the following states besides RUNNING ["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE"] --- src/sunstone/public/js/plugins/vms-tab.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 96711d5ff0..577f943cdf 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -49,6 +49,9 @@ var vm_graphs = [ } ]; + +var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE"]; + //Permanent storage for last value of aggregated network usage //Used to calculate bandwidth var netUsage = { @@ -1581,7 +1584,8 @@ function vncIcon(vm){ var graphics = vm.TEMPLATE.GRAPHICS; var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE); var gr_icon; - if (graphics && graphics.TYPE == "vnc" && state == tr("RUNNING")){ + + if (graphics && graphics.TYPE == "vnc" && $.inArray(state, VNCstates)){ gr_icon = ''; gr_icon += '\"'+tr("Open'; } From e0d82d595ecfe3c849dcd4244a748416d32ba163 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 23 Nov 2012 17:30:26 +0100 Subject: [PATCH 2/2] bug #1628: inArray doesn't return false, but rather -1 --- src/sunstone/public/js/plugins/vms-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 577f943cdf..02a0169059 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -1585,7 +1585,7 @@ function vncIcon(vm){ var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE); var gr_icon; - if (graphics && graphics.TYPE == "vnc" && $.inArray(state, VNCstates)){ + if (graphics && graphics.TYPE == "vnc" && $.inArray(state, VNCstates)!=-1){ gr_icon = ''; gr_icon += '\"'+tr("Open'; }