From 169ad1e59461c81a544c17a1a1d7dc0f837c310f Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 29 Jul 2011 19:04:02 +0200 Subject: [PATCH] Bug #752: Re fix: take into account several history_records and vm state to show correct hostname --- src/ozones/Server/public/js/ozones-util.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ozones/Server/public/js/ozones-util.js b/src/ozones/Server/public/js/ozones-util.js index b759e05350..c6cae737f2 100644 --- a/src/ozones/Server/public/js/ozones-util.js +++ b/src/ozones/Server/public/js/ozones-util.js @@ -33,6 +33,16 @@ function updateVMsList(req,list,tag,zone_id,zone_name){ $.each(list,function(){ var vm = this.VM; var state = oZones.Helper.resource_state("vm",vm.STATE); + var hostname = "--"; + + if (state == "ACTIVE" || state == "SUSPENDED"){ + if (vm.HISTORY_RECORDS.HISTORY.constructor == Array){ + hostname = vm.HISTORY_RECORDS.HISTORY[vm.HISTORY_RECORDS.HISTORY.length-1].HOSTNAME; + } else { + hostname = vm.HISTORY_RECORDS.HISTORY.HOSTNAME; + }; + }; + if (state == "ACTIVE") { state = oZones.Helper.resource_state("vm_lcm",vm.LCM_STATE); } @@ -48,7 +58,7 @@ function updateVMsList(req,list,tag,zone_id,zone_name){ state, vm.CPU, humanize_size(vm.MEMORY), - vm.HISTORY_RECORDS ? vm.HISTORY_RECORDS.HISTORY.HOSTNAME : "--", + hostname, pretty_time(vm.STIME) ]); } else {