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

IDEMPIERE-1162

This commit is contained in:
Carlos Ruiz 2013-07-30 15:04:59 -05:00
parent cba6d77de7
commit bbfe58d4f0
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
migration/i1.0c-release/oracle/201307301502_IDEMPIERE-1162.sql Normal file
View File

@ -0,0 +1,25 @@
-- Jul 30, 2013 3:02:24 PM COT
-- IDEMPIERE-1162
UPDATE R_MailText SET MailText='Dear @Name@,
You are receiving this email because you (or somebody pretending to be you) said you have lost your iDempiere password.
To access your iDempiere, use the temporary password from @AD_Client_ID<Name>@ below:
@#NewPassword@
Once you login, you will be directed to change password screen. Please change your password to something you can remember.
Sincerely,
The iDempiere Accounts Team
Note: This email address cannot accept replies.',Updated=TO_DATE('2013-07-30 15:02:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE R_MailText_ID=200000
;
-- Jul 30, 2013 3:02:24 PM COT
-- IDEMPIERE-1162
UPDATE R_MailText_Trl SET IsTranslated='N' WHERE R_MailText_ID=200000
;
SELECT register_migration_script('201307301502_IDEMPIERE-1162.sql') FROM dual
;

25
migration/i1.0c-release/postgresql/201307301502_IDEMPIERE-1162.sql Normal file
View File

@ -0,0 +1,25 @@
-- Jul 30, 2013 3:02:24 PM COT
-- IDEMPIERE-1162
UPDATE R_MailText SET MailText='Dear @Name@,
You are receiving this email because you (or somebody pretending to be you) said you have lost your iDempiere password.
To access your iDempiere, use the temporary password from @AD_Client_ID<Name>@ below:
@#NewPassword@
Once you login, you will be directed to change password screen. Please change your password to something you can remember.
Sincerely,
The iDempiere Accounts Team
Note: This email address cannot accept replies.',Updated=TO_TIMESTAMP('2013-07-30 15:02:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE R_MailText_ID=200000
;
-- Jul 30, 2013 3:02:24 PM COT
-- IDEMPIERE-1162
UPDATE R_MailText_Trl SET IsTranslated='N' WHERE R_MailText_ID=200000
;
SELECT register_migration_script('201307301502_IDEMPIERE-1162.sql') FROM dual
;

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
View File

@ -509,7 +509,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
to.set_ValueOfColumn("Password", newPassword); // will be hashed and validate on saveEx
mailText.setUser(to);
String message = mailText.getMailText(true);
Env.setContext(m_ctx, "#NewPassword", newPassword);
message = Env.parseVariable(message, to, to.get_TrxName(), true);
Env.setContext(m_ctx, "#NewPassword", "");
EMail email = client.createEMail(to.getEMail(), mailText.getMailHeader(), message, mailText.isHtml());
if (mailText.isHtml())
email.setMessageHTML(mailText.getMailHeader(), message);