etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 UI - (1) to distinguish between getUpdatedItem() and getUpdatedData(), rename getUpdatedData() to getUpdatedItemWhenAsyncJobFails() since it's being called only when async job fails. (2) fix the space problem (tab size is not 2) from patch.

This commit is contained in:
Jessica Wang 2012-06-22 15:14:45 -07:00
parent efc45f9ee9
commit a7f3c4ba20
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/scripts/instances.js
View File

@ -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;
}
}
}
);

16
ui/scripts/sharedFunctions.js
View File

@ -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});
}
}
}
},

22
ui/scripts/ui/widgets/listView.js
View File

@ -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();
}
}
);
}