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

bug 4556: localize error handling of subgrid item action.

This commit is contained in:
Jessica Wang 2011-01-28 15:03:54 -08:00
parent 66bea670eb
commit 07460dda56
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/cloud.core.account.js
View File

@ -929,7 +929,13 @@ function doChangePassword($actionLink, $subgridItem) {
data: createURL("command=updateUser&id="+id+"&password="+password),
dataType: "json",
success: function(json) {
$subgridItem.find("#after_action_info").text("Change password action succeeded.");
var label = $actionLink.data("label");
var label2;
if(label in dictionary)
label2 = dictionary[label];
else
label2 = label;
$subgridItem.find("#after_action_info").text(label2 + " - " + g_dictionary["label.succeeded"]);
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
}
});

11
ui/scripts/cloud.core.js
View File

@ -287,11 +287,12 @@ function doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem) {
$("body").stopTime(timerKey);
$spinningWheel.hide();
if (result.jobstatus == 1) { // Succeeded
$subgridItem.find("#after_action_info").text(label2 + " action succeeded.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$subgridItem.find("#after_action_info").text(label2 + " - " + g_dictionary["label.succeeded"]);
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
afterActionSeccessFn(json, id, $subgridItem);
} else if (result.jobstatus == 2) { // Failed
$subgridItem.find("#after_action_info").text(label2 + " action failed. Reason: " + fromdb(result.jobresult.errortext));
var errorMsg = label2 + " - " + g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
$subgridItem.find("#after_action_info").text(errorMsg);
$subgridItem.find("#after_action_info_container").removeClass("success").addClass("error").show();
}
}
@ -324,8 +325,8 @@ function doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem) {
async: false,
success: function(json) {
$spinningWheel.hide();
$subgridItem.find("#after_action_info").text(label2 + " action succeeded.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$subgridItem.find("#after_action_info").text(label2 + " - " + g_dictionary["label.succeeded"]);
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
afterActionSeccessFn(json, id, $subgridItem);
},
error: function(XMLHttpResponse) {