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

TRUNK-3779 User secret answer should be required if the question is set,... #847

Closed
wants to merge 1 commit into
base: master
from
Jump to file or symbol
Failed to load files and symbols.
+8 −1
Diff settings

Always

Just for now

@@ -245,6 +245,11 @@ public String handleSubmission(WebRequest request, HttpSession httpSession, Mode
}
}
if (StringUtils.hasLength(secretQuestion) && !StringUtils.hasLength(secretAnswer))
errors.reject("error.User.secretAnswer.empty");
else if (!StringUtils.hasLength(secretQuestion) && StringUtils.hasLength(secretAnswer))
errors.reject("error.User.secretQuestion.empty");
new UserProperties(user.getUserProperties()).setSupposedToChangePassword(forcePassword);
UserValidator uv = new UserValidator();
@@ -1914,6 +1914,8 @@ error.password.requireNumber=Please choose a password that contains at least one
error.password.requireLetter=Please choose a password that contains at least one letter
error.password.different=Please choose a different password.
error.password.incorrect=Incorrect password.
error.User.secretAnswer.empty=Secret Answer is empty
error.User.secretQuestion.empty=Secret Question is empty
User.confirm=Confirm Password
User.confirm.description=Retype the password (for accuracy)
User.roles=Roles
@@ -2947,4 +2949,4 @@ reporting.betweenTheAgesOf=between the ages of {0} and {1}
reporting.whoAreDead=who are dead
reporting.whoAreAlive=who are alive
reporting.patientsInProgram=Patients in program
reportingcompatibility.CohortBuilder.sqlQuery.note.message2=Please note that your query should only return patient_id(i.e. it should start with something like select o.patient_id from)
reportingcompatibility.CohortBuilder.sqlQuery.note.message2=Please note that your query should only return patient_id(i.e. it should start with something like select o.patient_id from)
ProTip! Use n and p to navigate between commits in a pull request.