Skip to content

Commit 377fa43

Browse files
author
Jessica Wang
committed
bug 12981: login screen - show explicit error messages when login fails.
1 parent 66e7e64 commit 377fa43

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ state.Enabled=Enabled
55
label.system.wide.capacity=System-wide capacity
66
label.network.service.providers=Network Service Providers
77
message.launch.zone=Zone is ready to launch; please proceed to the next step.
8+
error.unable.to.reach.management.server=Unable to reach Management Server
89
#new labels (end) ************************************************************************************************
910

1011
label.add.compute.offering=Add compute offering

‎ui/index.jsp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2868,6 +2868,7 @@ dictionary = {
28682868
'message.you.must.have.at.least.one.physical.network': '<fmt:message key="message.you.must.have.at.least.one.physical.network" />',
28692869
'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" />',
28702870
'label.purpose': '<fmt:message key="label.purpose" />',
2871-
'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags" />'
2871+
'error.please.specify.physical.network.tags': '<fmt:message key="error.please.specify.physical.network.tags" />',
2872+
'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server" />'
28722873
};
28732874
</script>

‎ui/scripts/cloudStack.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,15 @@
263263
// TEMPORARY -- replace w/ output of capability response, etc., once implemented
264264
window.g_projectsInviteRequired = false;
265265
},
266-
error: function() {
267-
args.response.error();
266+
error: function(XMLHttpRequest) {
267+
var errorMsg = parseXMLHttpResponse(XMLHttpRequest);
268+
if(errorMsg.length == 0) {
269+
if(XMLHttpRequest.status == 0)
270+
errorMsg = dictionary['error.unable.to.reach.management.server'];
271+
else
272+
errorMsg = dictionary['label.error'];
273+
}
274+
args.response.error(errorMsg);
268275
},
269276
beforeSend : function(XMLHttpResponse) {
270277
return true;

‎ui/scripts/ui-custom/login.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
});
7676
},
7777
error: function(args) {
78-
cloudStack.dialog.notice({ message: 'Invalid username and/or password.' });
78+
cloudStack.dialog.notice({ message: args });
7979
}
8080
}
8181
});

0 commit comments

Comments
 (0)