This is an automated email from the git hooks/post-receive script. New commit to branch feature/14_add_rss_feed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 42b7384ca379b8e4779c2964dd746304a4f20bc1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:09:03 2017 +0200 refs #14 do not display user name if the vote is anonymous --- .../java/org/chorem/pollen/services/service/FeedService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java index 96239861..f6570f63 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FeedService.java @@ -91,8 +91,15 @@ public class FeedService extends PollenServiceSupport { SyndFeed feed = getFeedForPoll(poll.getTopiaId()); List<SyndEntry> entries = new ArrayList<>(feed.getEntries()); + String voterName; + if (vote.isAnonymous()) { + voterName = t("pollen.service.feed.anonymous"); + } else { + voterName = vote.getVoter().getName(); + } + SyndEntry entry = new SyndEntryImpl(); - entry.setTitle(t(messageKey, vote.getVoter().getName())); + entry.setTitle(t(messageKey, voterName)); entry.setLink(getPollVoteUrl(poll)); entry.setPublishedDate(vote.getTopiaCreateDate()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.