diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index dae1e7be916..25f004ee7b4 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -537,7 +537,7 @@ dataType: "json", success: function(json) { var jid = json.deployvirtualmachineresponse.jobid; - var vmid = json.deployvirtualmachineresponse.id; + var vmid = json.deployvirtualmachineresponse.id; args.response.success( {_custom: {jobId: jid, @@ -550,18 +550,18 @@ getActionFilter: function() { return vmActionfilter; }, - getUpdatedData: function() { - var item; - $.ajax({ - url: createURL("listVirtualMachines&id="+vmid), - dataType: "json", - async: false, - success: function(json) { - item = json.listvirtualmachinesresponse.virtualmachine[0]; - } - }); - return item; - } + getUpdatedItemWhenAsyncJobFails: function() { + var item; + $.ajax({ + url: createURL("listVirtualMachines&id="+vmid), + dataType: "json", + async: false, + success: function(json) { + item = json.listvirtualmachinesresponse.virtualmachine[0]; + } + }); + return item; + } } } ); diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index e0fb8e80184..1c95928721c 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -82,14 +82,14 @@ var pollAsyncJobResult = function(args) { } else if (result.jobstatus == 2) { // Failed var msg = (result.jobresult.errortext == null)? "": result.jobresult.errortext; - if (args._custom.getUpdatedData != null && args._custom.getActionFilter != null) { - args.error({message: msg, updatedData: args._custom.getUpdatedData(), actionFilter: args._custom.getActionFilter()}); - } else if (args._custom.getUpdatedData != null && args._custom.getActionFilter == null) { - args.error({message: msg, updatedData: args._custom.getUpdatedData()}); - } - else { - args.error({message: msg}); - } + if (args._custom.getUpdatedItemWhenAsyncJobFails != null && args._custom.getActionFilter != null) { + args.error({message: msg, updatedData: args._custom.getUpdatedItemWhenAsyncJobFails(), actionFilter: args._custom.getActionFilter()}); + } else if (args._custom.getUpdatedItemWhenAsyncJobFails != null && args._custom.getActionFilter == null) { + args.error({message: msg, updatedData: args._custom.getUpdatedItemWhenAsyncJobFails()}); + } + else { + args.error({message: msg}); + } } } }, diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 6d7d48a2bfd..761df05093a 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -93,17 +93,17 @@ // Error function(args) { - if (args && args.updatedData) { - if ($item.is(':visible') && !isHeader) { - replaceItem( - $item, - args.updatedData, - args.actionFilter - ); - } - } else { - $item.remove(); - } + if (args && args.updatedData) { + if ($item.is(':visible') && !isHeader) { + replaceItem( + $item, + args.updatedData, + args.actionFilter + ); + } + } else { + $item.remove(); + } } ); }