diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 2611afa132e..b97c902413e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -19,6 +19,9 @@ label.add=Add
label.adding.processing=Adding....
label.adding.succeeded=Adding Succeeded
label.adding.failed=Adding Failed
+label.succeeded=Succeeded
+label.failed=Failed
+label.error.code=Error Code
label.add.zone=Add Zone
label.adding.zone=Adding Zone
label.add.host=Add Host
diff --git a/ui/index.jsp b/ui/index.jsp
index 10cdb4178c7..bf2ebfc4ad4 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -67,7 +67,10 @@
g_dictionary = {
'label.adding.processing' : '',
'label.adding.succeeded' : '',
- 'label.adding.failed' : ''
+ 'label.adding.failed' : '',
+ 'label.succeeded' : '',
+ 'label.failed' : '',
+ 'label.error.code': ''
};
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index b0ad7267c60..ec202e4836e 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -410,12 +410,14 @@ function doActionToMidMenu(id, apiInfo, apiCommand) {
$midmenuItem1.find("#content").removeClass("inaction");
$midmenuItem1.find("#spinning_wheel").hide();
hideDetailsTabActionSpinningWheel(id, inProcessText2, $midmenuItem1);
+
if (result.jobstatus == 1) { // Succeeded
$midmenuItem1.find("#info_icon").removeClass("error").show();
- $midmenuItem1.data("afterActionInfo", (label2 + " action succeeded."));
+ $midmenuItem1.data("afterActionInfo", (label2 + " - " + g_dictionary["label.succeeded"]));
afterActionSeccessFn(json, $midmenuItem1, id);
} else if (result.jobstatus == 2) { // Failed
- var errorMsg = label2 + " action failed. Reason: " + fromdb(result.jobresult.errortext);
+ //var errorMsg = label2 + " action failed. Reason: " + fromdb(result.jobresult.errortext);
+ var errorMsg = label2 + " - " + g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
handleErrorInMidMenu2(errorMsg, $midmenuItem1, id, inProcessText2);
}
}
@@ -447,7 +449,8 @@ function doActionToMidMenu(id, apiInfo, apiCommand) {
$midmenuItem1.find("#content").removeClass("inaction");
$midmenuItem1.find("#spinning_wheel").hide();
$midmenuItem1.find("#info_icon").removeClass("error").show();
- $midmenuItem1.data("afterActionInfo", (label2 + " action succeeded."));
+ //$midmenuItem1.data("afterActionInfo", (label2 + " action succeeded."));
+ $midmenuItem1.data("afterActionInfo", (label2 + " - " + g_dictionary["label.succeeded"]));
hideDetailsTabActionSpinningWheel(id, inProcessText2, $midmenuItem1);
afterActionSeccessFn(json, $midmenuItem1, id);
},
@@ -529,7 +532,7 @@ function copyActionInfoFromMidMenuToRightPanel($midmenuItem1) {
if(inProcessText in dictionary)
$detailsTabSpinningWheel.find("#description").text(dictionary[inProcessText]);
else
- $detailsTabSpinningWheel.find("#description").text(label);
+ $detailsTabSpinningWheel.find("#description").text(inProcessText);
$detailsTabSpinningWheel.show();
}
}