Author: bleny Date: 2014-07-07 14:42:39 +0200 (Mon, 07 Jul 2014) New Revision: 2125 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2125 Log: fixes #5378 change from header for harmonie mail Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -962,6 +962,8 @@ } } else { + email.setFrom(observer); + email.addBcc(observer); email.addTo(emailToUpdateAllegroWallets); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -25,6 +25,7 @@ import com.github.mustachejava.Mustache; import com.github.mustachejava.MustacheFactory; import com.google.common.base.Charsets; +import com.google.common.base.Objects; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; @@ -54,8 +55,8 @@ if (getApplicationConfig().isDevMode()) { if (log.isInfoEnabled()) { - log.info("an email should have been sent if not in devMode: tos = " + - mail.getTos() + ". subject = '" + mail.getSubject() + "'. body = \n" + getBody(mail)); + log.info("an email should have been sent if not in devMode: from = " + mail.getFrom() + ", tos = " + + mail.getTos() + ", subject = '" + mail.getSubject() + "', body = \n" + getBody(mail)); } if (log.isWarnEnabled()) { @@ -92,8 +93,13 @@ try { - newEmail.setFrom(applicationConfig.getSmtpFrom()); + String from = + Objects.firstNonNull( + mail.getFrom(), + applicationConfig.getSmtpFrom()); + newEmail.setFrom(from); + for (String to : mail.getTos()) { newEmail.addTo(to); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -38,6 +38,8 @@ protected Set<String> bccs; + protected String from; + public WaoMail(Locale locale) { this.locale = locale; } @@ -91,4 +93,16 @@ return isRecipientProvided; } + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public void setFrom(WaoUser waoUser) { + Preconditions.checkArgument(waoUser.isActive()); + setFrom(waoUser.getLogin()); + } }