mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-18 10:53:13 +09:00
Merge branch 'bug-1628'
This commit is contained in:
commit
c3ba653765
1 file changed
+5
-1
@@ -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)!=-1){
|
||||
gr_icon = '<a class="vnc" href="#" vm_id="'+vm.ID+'">';
|
||||
gr_icon += '<img src="images/vnc_on.png" alt=\"'+tr("Open VNC Session")+'\" /></a>';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user