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

IDEMPIERE-374 Change password must be changed to be a form instead of a process - revise save error message

This commit is contained in:
Elaine Tan 2012-09-26 16:09:53 +08:00
parent 0347e6f4e8
commit 7863ff524c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/compiere/model/MUser.java
View File

@ -902,7 +902,7 @@ public class MUser extends X_AD_User
if (email_login && getPassword() != null && getPassword().length() > 0) { if (email_login && getPassword() != null && getPassword().length() > 0) {
// email is mandatory for users with password // email is mandatory for users with password
if (getEMail() == null || getEMail().length() == 0) { if (getEMail() == null || getEMail().length() == 0) {
log.saveError("FillMandatory", Msg.getElement(getCtx(), COLUMNNAME_EMail)); log.saveError("SaveError", Msg.getMsg(getCtx(), "FillMandatory") + Msg.getElement(getCtx(), COLUMNNAME_EMail));
return false; return false;
} }
// email with password must be unique on the same tenant // email with password must be unique on the same tenant
@ -910,7 +910,7 @@ public class MUser extends X_AD_User
"SELECT COUNT(*) FROM AD_User WHERE Password IS NOT NULL AND EMail=? AND AD_Client_ID=? AND AD_User_ID!=?", "SELECT COUNT(*) FROM AD_User WHERE Password IS NOT NULL AND EMail=? AND AD_Client_ID=? AND AD_User_ID!=?",
getEMail(), getAD_Client_ID(), getAD_User_ID()); getEMail(), getAD_Client_ID(), getAD_User_ID());
if (cnt > 0) { if (cnt > 0) {
log.saveError("SaveErrorNotUnique", Msg.getElement(getCtx(), COLUMNNAME_EMail)); log.saveError("SaveError", Msg.getMsg(getCtx(), "SaveErrorNotUnique", true) + Msg.getElement(getCtx(), COLUMNNAME_EMail));
return false; return false;
} }
} }