-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix bug#109 #110
Fix bug#109 #110
Conversation
$('#passwordErrorMessage').text(xhr.responseText) | ||
$('#passwordErrorMessage').text(xhr.responseText); | ||
$("#passwordErrorMessage:contains('login')").html(function(_, html) { | ||
return html.replace(/(login)/g, '<a href="/login">$1</a>'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to use the responseText at all. The javascript should include its own message.
Please review, thanks |
$("#passwordErrorMessage:contains('login')").html(function(_, html) { | ||
return html.replace(/(login)/g, '<a href="/login">$1</a>'); | ||
}); | ||
$('#passwordErrorMessage').html("Account already exists! You may go ahead and <a href='protected/login'>login</a>."); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to check the status code and only print your error message if CONFLICT was detected. Otherwise, you need to show a different message or messages.
Please review it, thanks |
@@ -137,7 +137,14 @@ window.eureka.registration = new function () { | |||
}, | |||
error: function (xhr, err) { | |||
$('#passwordChangeFailure').show(); | |||
$('#passwordErrorMessage').text(xhr.responseText) | |||
if (xhr.status == "409") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please make this a switch statement. Also, status should be returning a numerical value not a string.
She wrote the msg as : |
Please review, thanks |
de698ef
to
45612df
Compare
…er-webapp needs CAS redirect operation, which does not support POST payload
@@ -44,7 +44,7 @@ | |||
|
|||
<template:insert template="/templates/eureka_main.jsp"> | |||
<template:content name="content"> | |||
<h3>Account Settings ${user.username}</h3> | |||
<h3>Account Settings1111 ${user.username}</h3> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't look right.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has been fixed in the later commit
Please resolve conflicts with pom.xml. Thx. |
I just solved the conflict in pom.xml file, you can merge now |
No description provided.