diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 8bbde6a5166..9d79d3fa8b3 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -4354,14 +4354,25 @@ }, success: function(data) { loadCurrent++; + var vms = data.listvirtualmachinesresponse.virtualmachine; + + //if this VM is destroyed, data.listvirtualmachinesresponse.virtualmachine will be undefined for regular-user (CLOUDSTACK-3195) + if (vms == undefined) { + vms = [{ + "id": item.virtualmachineid, + "name": item.virtualmachinename, + "displayname": item.virtualmachinedisplayname + }]; + } + $.extend(item, { - _itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) { + _itemData: $.map(vms, function(vm) { return $.extend(vm, { _displayName: '

VM: ' + vm.name + '

' + '

IP: ' + item.vmguestip + '

' // Also display attached IP }); }), _context: { - instances: data.listvirtualmachinesresponse.virtualmachine + instances: vms } });