midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hg merge release-4.1 (merge release4.1 into development)

This commit is contained in:
Carlos Ruiz 2017-07-21 20:18:53 +02:00
parent 80d851ed8e 363bedd9f5
commit 1793361fcf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/model/MPasswordRule.java
View File

@ -217,7 +217,8 @@ public class MPasswordRule extends X_AD_PasswordRule {
// validator all rule // validator all rule
if (!ruleList.isEmpty()) { if (!ruleList.isEmpty()) {
PasswordValidator validator = new PasswordValidator(getCustomResolver(), ruleList); PasswordValidator validator = new PasswordValidator(getCustomResolver(), ruleList);
PasswordData passwordData = PasswordData.newInstance(newPassword, username, historyData); PasswordData passwordData = new PasswordData(username, newPassword);
passwordData.setPasswordReferences(historyData);
RuleResult result = validator.validate(passwordData); RuleResult result = validator.validate(passwordData);
if (!result.isValid()) { if (!result.isValid()) {
StringBuilder error = new StringBuilder(Msg.getMsg(getCtx(), "PasswordErrors")); StringBuilder error = new StringBuilder(Msg.getMsg(getCtx(), "PasswordErrors"));