mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
bug 4556: localize error handling of details tab action.
This commit is contained in:
Jessica Wang
parent
1e591e1963
commit
0225b51221
@ -22,6 +22,7 @@ label.adding.failed=Adding Failed
|
||||
label.succeeded=Succeeded
|
||||
label.failed=Failed
|
||||
label.error.code=Error Code
|
||||
label.new.password=New Password
|
||||
label.add.zone=Add Zone
|
||||
label.adding.zone=Adding Zone
|
||||
label.add.host=Add Host
|
||||
|
||||
12
ui/index.jsp
12
ui/index.jsp
@ -65,12 +65,12 @@
|
||||
|
||||
<script language="javascript">
|
||||
g_dictionary = {
|
||||
'label.adding.processing' : '<fmt:message key="label.adding.processing"/>',
|
||||
'label.adding.succeeded' : '<fmt:message key="label.adding.succeeded"/>',
|
||||
'label.adding.failed' : '<fmt:message key="label.adding.failed"/>',
|
||||
'label.succeeded' : '<fmt:message key="label.succeeded"/>',
|
||||
'label.failed' : '<fmt:message key="label.failed"/>',
|
||||
'label.error.code': '<fmt:message key="label.error.code"/>'
|
||||
'label.adding.processing': '<fmt:message key="label.adding.processing"/>',
|
||||
'label.adding.succeeded': '<fmt:message key="label.adding.succeeded"/>',
|
||||
'label.adding.failed': '<fmt:message key="label.adding.failed"/>',
|
||||
'label.succeeded': '<fmt:message key="label.succeeded"/>',
|
||||
'label.failed': '<fmt:message key="label.failed"/>',
|
||||
'label.error.code': '<fmt:message key="label.error.code"/>',
|
||||
};
|
||||
</script>
|
||||
</head>
|
||||
|
||||
@ -7,36 +7,37 @@
|
||||
|
||||
<script language="javascript">
|
||||
dictionary = {
|
||||
'label.action.start.instance' : '<fmt:message key="label.action.start.instance"/>',
|
||||
'label.action.start.instance.processing' : '<fmt:message key="label.action.start.instance.processing"/>',
|
||||
'message.action.start.instance' : '<fmt:message key="message.action.start.instance"/>',
|
||||
'label.action.stop.instance' : '<fmt:message key="label.action.stop.instance"/>',
|
||||
'label.action.stop.instance.processing' : '<fmt:message key="label.action.stop.instance.processing"/>',
|
||||
'message.action.stop.instance' : '<fmt:message key="message.action.stop.instance"/>',
|
||||
'label.action.reboot.instance' : '<fmt:message key="label.action.reboot.instance"/>',
|
||||
'label.action.reboot.instance.processing' : '<fmt:message key="label.action.reboot.instance.processing"/>',
|
||||
'message.action.reboot.instance' : '<fmt:message key="message.action.reboot.instance"/>',
|
||||
'label.action.destroy.instance' : '<fmt:message key="label.action.destroy.instance"/>',
|
||||
'label.action.destroy.instance.processing' : '<fmt:message key="label.action.destroy.instance.processing"/>',
|
||||
'message.action.destroy.instance' : '<fmt:message key="message.action.destroy.instance"/>',
|
||||
'label.action.restore.instance' : '<fmt:message key="label.action.restore.instance"/>',
|
||||
'label.action.restore.instance.processing' : '<fmt:message key="label.action.restore.instance.processing"/>',
|
||||
'message.action.restore.instance' : '<fmt:message key="message.action.restore.instance"/>',
|
||||
'label.action.edit.instance' : '<fmt:message key="label.action.edit.instance"/>',
|
||||
'label.action.attach.iso' : '<fmt:message key="label.action.attach.iso"/>',
|
||||
'label.action.attach.iso.processing' : '<fmt:message key="label.action.attach.iso.processing"/>',
|
||||
'label.action.detach.iso' : '<fmt:message key="label.action.detach.iso"/>',
|
||||
'label.action.detach.iso.processing' : '<fmt:message key="label.action.detach.iso.processing"/>',
|
||||
'label.action.reset.password' : '<fmt:message key="label.action.reset.password"/>',
|
||||
'label.action.reset.password.processing' : '<fmt:message key="label.action.reset.password.processing"/>',
|
||||
'label.action.change.service' : '<fmt:message key="label.action.change.service"/>',
|
||||
'label.action.change.service.processing' : '<fmt:message key="label.action.change.service.processing"/>',
|
||||
'label.action.detach.disk' : '<fmt:message key="label.action.detach.disk"/>',
|
||||
'label.action.detach.disk.processing' : '<fmt:message key="label.action.detach.disk.processing"/>',
|
||||
'label.action.create.template' : '<fmt:message key="label.action.create.template"/>',
|
||||
'label.action.create.template.processing' : '<fmt:message key="label.action.create.template.processing"/>',
|
||||
'label.action.take.snapshot' : '<fmt:message key="label.action.take.snapshot"/>',
|
||||
'label.action.take.snapshot.processing' : '<fmt:message key="label.action.take.snapshot.processing"/>'
|
||||
'label.action.start.instance': '<fmt:message key="label.action.start.instance"/>',
|
||||
'label.action.start.instance.processing': '<fmt:message key="label.action.start.instance.processing"/>',
|
||||
'message.action.start.instance': '<fmt:message key="message.action.start.instance"/>',
|
||||
'label.action.stop.instance': '<fmt:message key="label.action.stop.instance"/>',
|
||||
'label.action.stop.instance.processing': '<fmt:message key="label.action.stop.instance.processing"/>',
|
||||
'message.action.stop.instance': '<fmt:message key="message.action.stop.instance"/>',
|
||||
'label.action.reboot.instance': '<fmt:message key="label.action.reboot.instance"/>',
|
||||
'label.action.reboot.instance.processing': '<fmt:message key="label.action.reboot.instance.processing"/>',
|
||||
'message.action.reboot.instance': '<fmt:message key="message.action.reboot.instance"/>',
|
||||
'label.action.destroy.instance': '<fmt:message key="label.action.destroy.instance"/>',
|
||||
'label.action.destroy.instance.processing': '<fmt:message key="label.action.destroy.instance.processing"/>',
|
||||
'message.action.destroy.instance': '<fmt:message key="message.action.destroy.instance"/>',
|
||||
'label.action.restore.instance': '<fmt:message key="label.action.restore.instance"/>',
|
||||
'label.action.restore.instance.processing': '<fmt:message key="label.action.restore.instance.processing"/>',
|
||||
'message.action.restore.instance': '<fmt:message key="message.action.restore.instance"/>',
|
||||
'label.action.edit.instance': '<fmt:message key="label.action.edit.instance"/>',
|
||||
'label.action.attach.iso': '<fmt:message key="label.action.attach.iso"/>',
|
||||
'label.action.attach.iso.processing': '<fmt:message key="label.action.attach.iso.processing"/>',
|
||||
'label.action.detach.iso': '<fmt:message key="label.action.detach.iso"/>',
|
||||
'label.action.detach.iso.processing': '<fmt:message key="label.action.detach.iso.processing"/>',
|
||||
'label.action.reset.password': '<fmt:message key="label.action.reset.password"/>',
|
||||
'label.action.reset.password.processing': '<fmt:message key="label.action.reset.password.processing"/>',
|
||||
'label.action.change.service': '<fmt:message key="label.action.change.service"/>',
|
||||
'label.action.change.service.processing': '<fmt:message key="label.action.change.service.processing"/>',
|
||||
'label.action.detach.disk': '<fmt:message key="label.action.detach.disk"/>',
|
||||
'label.action.detach.disk.processing': '<fmt:message key="label.action.detach.disk.processing"/>',
|
||||
'label.action.create.template': '<fmt:message key="label.action.create.template"/>',
|
||||
'label.action.create.template.processing': '<fmt:message key="label.action.create.template.processing"/>',
|
||||
'label.action.take.snapshot': '<fmt:message key="label.action.take.snapshot"/>',
|
||||
'label.action.take.snapshot.processing': '<fmt:message key="label.action.take.snapshot.processing"/>',
|
||||
'label.new.password': '<fmt:message key="label.new.password"/>'
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
@ -1172,9 +1172,10 @@ function initVMWizard() {
|
||||
bindClickToMidMenu($midmenuItem1, vmToRightPanel, getMidmenuId);
|
||||
|
||||
if (item.passwordenabled == true) {
|
||||
var secondRowText = "New password is " + item.password;
|
||||
var secondRowText = dictionary["label.new.password"] + ": " + item.password;
|
||||
afterAddingMidMenuItem($midmenuItem1, true, secondRowText);
|
||||
|
||||
$midmenuItem1.data("afterActionInfo", secondRowText);
|
||||
/*
|
||||
var afterActionInfo = "Instance " + getVmName(item.name, item.displayname) + " has been created successfully. New password is " + item.password;
|
||||
$midmenuItem1.data("afterActionInfo", afterActionInfo);
|
||||
|
||||
@ -1184,7 +1185,8 @@ function initVMWizard() {
|
||||
"OK": function() {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}).dialog("open");
|
||||
}).dialog("open");
|
||||
*/
|
||||
}
|
||||
else {
|
||||
afterAddingMidMenuItem($midmenuItem1, true, null);
|
||||
@ -1311,6 +1313,7 @@ var vmActionMap = {
|
||||
var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;
|
||||
vmToMidmenu(jsonObj, $midmenuItem1);
|
||||
|
||||
/*
|
||||
$("#dialog_info")
|
||||
.text("New password of instance " + getVmName(jsonObj.name, jsonObj.displayname) + " is " + fromdb(jsonObj.password))
|
||||
.dialog('option', 'buttons', {
|
||||
@ -1318,8 +1321,9 @@ var vmActionMap = {
|
||||
$(this).dialog("close");
|
||||
}
|
||||
}).dialog("open");
|
||||
*/
|
||||
|
||||
return "New password is " + fromdb(jsonObj.password);
|
||||
return dictionary["label.new.password"] + ": " + fromdb(jsonObj.password);
|
||||
}
|
||||
},
|
||||
"label.action.change.service": {
|
||||
|
||||
@ -113,11 +113,12 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
|
||||
|
||||
//handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
|
||||
if(afterActionInfo == null)
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " action succeeded."));
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " - " + g_dictionary["label.succeeded"]));
|
||||
else
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, afterActionInfo);
|
||||
} else if (result.jobstatus == 2) { // Failed
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, (label2 + " action failed. Reason: " + fromdb(result.jobresult.errortext)));
|
||||
var errorMsg = label2 + " - " + g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, false, errorMsg);
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -150,7 +151,7 @@ function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
|
||||
success: function(json) {
|
||||
$spinningWheel.hide();
|
||||
afterActionSeccessFn(json, $midmenuItem1, id); //afterActionSeccessFn() will update $midmenuItem1.data("jsonObj")
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " action succeeded.")); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
|
||||
handleMidMenuItemAfterDetailsTabAction($midmenuItem1, true, (label2 + " - " + g_dictionary["label.succeeded"])); //handleMidMenuItemAfterDetailsTabAction() will used updated $midmenuItem1.data("jsonObj")
|
||||
},
|
||||
error: function(XMLHttpResponse) {
|
||||
handleError(XMLHttpResponse, function() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user