branch develop updated (772268b1 -> 321a9919)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 772268b1 refs #79 : envoie de mail chiffré new 321a9919 refs #172 : Ajouter dans le mail de création de sondage que les invitations ne sont pas encore parti The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 321a9919a78b3f1cdb8c177c5acbb9e70879702b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 30 11:25:59 2018 +0200 refs #172 : Ajouter dans le mail de création de sondage que les invitations ne sont pas encore parti Summary of changes: .../org/chorem/pollen/services/service/mail/PollCreatedEmail.java | 5 +++++ pollen-services/src/main/resources/email/PollCreatedEmail.mustache | 4 ++++ .../src/main/resources/email/PollCreatedEmail_fr.mustache | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 321a9919a78b3f1cdb8c177c5acbb9e70879702b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 30 11:25:59 2018 +0200 refs #172 : Ajouter dans le mail de création de sondage que les invitations ne sont pas encore parti --- .../org/chorem/pollen/services/service/mail/PollCreatedEmail.java | 5 +++++ pollen-services/src/main/resources/email/PollCreatedEmail.mustache | 4 ++++ .../src/main/resources/email/PollCreatedEmail_fr.mustache | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java index 00b8ea17..484344da 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollCreatedEmail.java @@ -22,6 +22,7 @@ package org.chorem.pollen.services.service.mail; */ import org.chorem.pollen.persistence.entity.Poll; +import org.chorem.pollen.persistence.entity.Polls; import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.TopiaEntity; @@ -76,6 +77,10 @@ public class PollCreatedEmail extends PollenMail { this.url = url; } + public boolean isRestricted() { + return Polls.isPollRestricted(poll); + } + @Override public List<TopiaEntity> getEntitiesKey() { return Collections.singletonList(poll); diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache index 54ac50ac..50674bd2 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail.mustache @@ -13,3 +13,7 @@ You have just created the poll "{{poll.title}}". {{/poll.description}} You can administrate this poll here: {{url}} + +{{#restricted}}Warning : + Invitation emails for poll participants are not yet sent. + Go to administration page of your poll for sent.{{/restricted}} \ No newline at end of file diff --git a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache index 7966f869..e215d8ef 100644 --- a/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/PollCreatedEmail_fr.mustache @@ -12,4 +12,8 @@ Vous venez de créer le sondage "{{poll.title}}". {{/poll.description}} -Vous pouvez administrer ce sondage ici : {{url}} \ No newline at end of file +Vous pouvez administrer ce sondage ici : {{url}} + +{{#restricted}}Attention : + Les courriels d'invitations pour les participants au sondage ne sont pas encore envoyés. + Allez sur le page d'administration de votre sondage pour les envoyés.{{/restricted}} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm