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

bug 12981: login screen - show explicit error messages when login fails.

This commit is contained in:
Jessica Wang 2012-03-02 16:43:14 -08:00
parent 66e7e64915
commit 377fa4361f
4 changed files with 13 additions and 4 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

@ -5,6 +5,7 @@ state.Enabled=Enabled
label.system.wide.capacity=System-wide capacity
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
#new labels (end) ************************************************************************************************
label.add.compute.offering=Add compute offering

3
ui/index.jsp
View File

@ -2868,6 +2868,7 @@ dictionary = {
'message.you.must.have.at.least.one.physical.network': '<fmt:message key="message.you.must.have.at.least.one.physical.network" />',
'message.please.select.a.different.public.and.management.network.before.removing': '<fmt:message key="message.please.select.a.different.public.and.management.network.before.removing" />',
'label.purpose': '<fmt:message key="label.purpose" />',
'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags" />'
'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" />'
};
</script>

11
ui/scripts/cloudStack.js
View File

@ -263,8 +263,15 @@
// TEMPORARY -- replace w/ output of capability response, etc., once implemented
window.g_projectsInviteRequired = false;
},
error: function() {
args.response.error();
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'];
}
args.response.error(errorMsg);
},
beforeSend : function(XMLHttpResponse) {
return true;

2
ui/scripts/ui-custom/login.js
View File

@ -75,7 +75,7 @@
});
},
error: function(args) {
cloudStack.dialog.notice({ message: 'Invalid username and/or password.' });
cloudStack.dialog.notice({ message: args });
}
}
});