From 00c48f985b05f8ab19b2814c15ddb06bb7e1855e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 23 Mar 2012 15:56:41 -0700 Subject: [PATCH] bug 14481: cloudstack 3.0 UI - instance page - after a regular user destroys a VM, listVirtualMachines API will no longer returns this destroyed VM to the regular user. So, add additional code in dataProvider() to handle this case. --- ui/scripts/instances.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index dd8933a0258..f84b5483a90 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1554,8 +1554,13 @@ url: createURL("listVirtualMachines&id=" + args.context.instances[0].id), dataType: "json", async: true, - success: function(json) { - var jsonObj = json.listvirtualmachinesresponse.virtualmachine[0]; + success: function(json) { + var jsonObj; + if(json.listvirtualmachinesresponse.virtualmachine != null && json.listvirtualmachinesresponse.virtualmachine.length > 0) + jsonObj = json.listvirtualmachinesresponse.virtualmachine[0]; + else + jsonObj = $.extend(args.context.instances[0], {state: "Destroyed",}); //after a regular user destroys a VM, listVirtualMachines API will no longer returns this destroyed VM to the regular user. + args.response.success( { actionFilter: vmActionfilter,