This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ce4e2f058a3b706d09ee3dfb45590aac33dddf21 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jun 6 15:29:07 2017 +0200 Signature basée sur les données du context d'ui, pas du mail --- .../org/chorem/pollen/services/service/mail/EmailService.java | 8 ++++---- pollen-services/src/main/resources/email/signing.mustache | 2 +- pollen-services/src/main/resources/email/signing_fr.mustache | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index be182080..6dc4ebac 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -313,14 +313,14 @@ public class EmailService extends PollenServiceSupport { Mustache mustache; try { - mail.setSigning(getSigning(mustacheFactory, signingTemplateName, mail)); + mail.setSigning(getSigning(mustacheFactory, signingTemplateName)); mustache = mustacheFactory.compile(templateName); } catch (MustacheException e) { // fallback with no locale signingTemplateName = "signing.mustache"; - mail.setSigning(getSigning(mustacheFactory, signingTemplateName, mail)); + mail.setSigning(getSigning(mustacheFactory, signingTemplateName)); templateName = mail.getClass().getSimpleName() + ".mustache"; mustache = mustacheFactory.compile(templateName); @@ -329,10 +329,10 @@ public class EmailService extends PollenServiceSupport { return mustache; } - protected String getSigning(MustacheFactory mustacheFactory, String signingTemplateName, PollenMail mail) { + protected String getSigning(MustacheFactory mustacheFactory, String signingTemplateName) { StringWriter stringWriter = new StringWriter(); Mustache mustache = mustacheFactory.compile(signingTemplateName); - mustache.execute(stringWriter, mail); + mustache.execute(stringWriter, getUIContext()); return stringWriter.toString(); } diff --git a/pollen-services/src/main/resources/email/signing.mustache b/pollen-services/src/main/resources/email/signing.mustache index 24acddb6..386757d7 100644 --- a/pollen-services/src/main/resources/email/signing.mustache +++ b/pollen-services/src/main/resources/email/signing.mustache @@ -3,4 +3,4 @@ -- Pollen, online poll webapp -{{pollenUrl}} \ No newline at end of file +{{uiEndPoint}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/signing_fr.mustache b/pollen-services/src/main/resources/email/signing_fr.mustache index 38352e8c..1644c535 100644 --- a/pollen-services/src/main/resources/email/signing_fr.mustache +++ b/pollen-services/src/main/resources/email/signing_fr.mustache @@ -3,4 +3,4 @@ -- Pollen, application de sondages en ligne -{{pollenUrl}} \ No newline at end of file +{{uiEndPoint}} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.