This is an automated email from the git hooks/post-receive script. New commit to branch feature/april in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit e8360a65d677f53a0b3f2f926b26f51a0efb09f4 Author: jcouteau <couteau@codelutin.com> Date: Thu Sep 20 11:59:08 2018 +0200 fixes #210 : Cleaning code and doc --- docs/config.md | 1 + .../main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java | 1 + .../java/org/chorem/pollen/services/service/PollenUserService.java | 5 +++-- .../src/main/resources/i18n/pollen-services_en_GB.properties | 1 - .../src/main/resources/i18n/pollen-services_fr_FR.properties | 1 - 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/config.md b/docs/config.md index 29b02eea..4f578225 100644 --- a/docs/config.md +++ b/docs/config.md @@ -115,6 +115,7 @@ Si le mail reçu provient d’un retour d’une invitation à un sondage, il ser | pollen.default.usersCanCreatePoll | Quels utilisateurs peuvent créer des sondages | All_USERS, USERS_CONNECTED ou USERS_SELECTED | All_USERS | | pollen.deleteObsoleteSessionTokensCronSchedule | Intervalle entre deux lancements de la suppression des tokens de session obsolètes | CRON | 0 0/5 * * * ? | | pollen.anonymizeOlderVotesCronSchedule | Intervalle entre deux lancements de l'anonymisation des anciens votes | CRON | 0 0 0 * * ? | +| pollen.anonymizeOlderVotesAge | Age minimum des votes anonymisés (en secondes). Les votes plus agés sont anonymisés | Numérique | 63072000 | Site public diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java index bf627b6a..7e946a4d 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -26,6 +26,7 @@ import org.nuiton.topia.persistence.HqlAndParametersBuilder; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Map; public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 6f740777..9b060618 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -33,6 +33,7 @@ import org.chorem.pollen.persistence.entity.PollenUserEmailAddress; import org.chorem.pollen.persistence.entity.ResourceType; import org.chorem.pollen.persistence.entity.UserCredential; import org.chorem.pollen.persistence.entity.Vote; +import org.chorem.pollen.persistence.entity.VoteTopiaDao; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PaginationResultBean; @@ -548,7 +549,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer for (Vote vote : votesUser) { PollenPrincipal anonymousUser = getSecurityService().generatePollenPrincipal(); - anonymousUser.setName("?"); + anonymousUser.setName(VoteTopiaDao.ANONYMOUS_NAME); vote.setVoter(anonymousUser); vote.setAnonymous(true); } @@ -557,7 +558,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer for (Comment comment : commentsUser) { PollenPrincipal anonymousUser = getSecurityService().generatePollenPrincipal(); - anonymousUser.setName("?"); + anonymousUser.setName(VoteTopiaDao.ANONYMOUS_NAME); comment.setAuthor(anonymousUser); } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index 49f01d06..06aa85e7 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -28,7 +28,6 @@ pollen.configuration.report.maxScore=Maximum score for reporting before administ pollen.configuration.resendEmailsCronSchedule=Time between two cron jobs of email resending pollen.configuration.resource.maxSize=Maximum size of pollen resource pollen.configuration.resource.preview.max=Maximum dimension of image preview -pollen.configuration.rpgdPurgeCronSchedule= pollen.configuration.sendEndPollRemindersCronSchedule=Time between two cron jobs of poll end reminder sending pollen.configuration.smptHost=Smtp Host pollen.configuration.smtpFrom=Smtp From diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index b21fddcf..3221b2e0 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -28,7 +28,6 @@ pollen.configuration.report.maxScore=Score maximum pour un signalement avant que pollen.configuration.resendEmailsCronSchedule=Intervalle entre deux lancements de la tâche de renvoi des emails en erreur pollen.configuration.resource.maxSize=Taille maximal pour un fichier de resource de Pollen pollen.configuration.resource.preview.max=Dimension maximal de la prévisualisation d'un image -pollen.configuration.rpgdPurgeCronSchedule= pollen.configuration.sendEndPollRemindersCronSchedule=Intervalle entre deux lancements de la tâche d'envoi de mails de rappel de fin de sondage pollen.configuration.smptHost=Hôte smtp pollen.configuration.smtpFrom=Expéditeur -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.