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

bug 14377: cloudstack 3.0 UI - login - if login fails due to invalid username and password, show a generic error message instead of API returned error message.

This commit is contained in:
Jessica Wang 2012-03-19 16:03:22 -07:00
parent 4303e30ae0
commit 20acc4d315
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -8,6 +8,7 @@ message.launch.zone=Zone is ready to launch; please proceed to the next step.
error.unable.to.reach.management.server=Unable to reach Management Server
label.internal.name=Internal name
label.max.networks=Max. networks
error.invalid.username.password=Invalid username or password
#new labels (end) ************************************************************************************************
#modified labels (begin) *****************************************************************************************

2
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -7,6 +7,8 @@ label.network.service.providers=Network Service Providers
message.launch.zone=Zone is ready to launch; please proceed to the next step.
error.unable.to.reach.management.server=Unable to reach Management Server
label.internal.name=Internal name
label.max.networks=Max. networks
error.invalid.username.password=Invalid username or password
#new labels (end) ************************************************************************************************
#modified labels (begin) *****************************************************************************************

3
ui/index.jsp
View File

@ -2875,6 +2875,7 @@ dictionary = {
'label.purpose': '<fmt:message key="label.purpose" />',
'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags" />',
'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server" />',
'label.internal.name': '<fmt:message key="label.internal.name" />'
'label.internal.name': '<fmt:message key="label.internal.name" />',
'error.invalid.username.password': '<fmt:message key="error.invalid.username.password" />'
};
</script>

12
ui/scripts/cloudStack.js
View File

@ -267,13 +267,11 @@
window.g_projectsInviteRequired = false;
},
error: function(XMLHttpRequest) {
var errorMsg = parseXMLHttpResponse(XMLHttpRequest);
if(errorMsg.length == 0) {
if(XMLHttpRequest.status == 0)
errorMsg = dictionary['error.unable.to.reach.management.server'];
else
errorMsg = dictionary['label.error'];
}
var errorMsg = parseXMLHttpResponse(XMLHttpRequest);
if(errorMsg.length == 0 && XMLHttpRequest.status == 0)
errorMsg = dictionary['error.unable.to.reach.management.server'];
else
errorMsg = _l('error.invalid.username.password'); //override error message
args.response.error(errorMsg);
},
beforeSend : function(XMLHttpResponse) {