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 bf4a2896d1640c9b6158d98b822dc95b85feef8b Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 2 10:56:32 2018 +0200 refs #221 Vote associatif - FeedService should be ok --- .../pollen/services/service/FeedService.java | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) 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 862f3b50..e5da0364 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 @@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.Comment; import org.chorem.pollen.persistence.entity.Poll; +import org.chorem.pollen.persistence.entity.Question; import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.services.PollenTechnicalException; import org.chorem.pollen.services.service.security.PollenPermissions; @@ -98,20 +99,20 @@ public class FeedService extends PollenServiceSupport { addFeedEntry(poll, t("pollen.service.feed.pollReopened.title")); } - public void onChoiceAdded(Poll poll, Choice choice) { - addFeedEntry(poll, t("pollen.service.feed.choiceAdded.title")); + public void onChoiceAdded(Question question, Choice choice) { + addFeedEntry(question.getPoll(), t("pollen.service.feed.choiceAdded.title")); } - public void onVoteAdded(Poll poll, Vote vote) { - addVoteFeedEntry(poll, vote, n("pollen.service.feed.voteAdded.title")); + public void onVoteAdded(Question question, Vote vote) { + addVoteFeedEntry(question.getPoll(), vote, n("pollen.service.feed.voteAdded.title")); } - public void onVoteEdited(Poll poll, Vote vote) { - addVoteFeedEntry(poll, vote, n("pollen.service.feed.voteEdited.title")); + public void onVoteEdited(Question question, Vote vote) { + addVoteFeedEntry(question.getPoll(), vote, n("pollen.service.feed.voteEdited.title")); } - public void onVoteDeleted(Poll poll, Vote vote) { - addVoteFeedEntry(poll, vote, n("pollen.service.feed.voteDeleted.title")); + public void onVoteDeleted(Question question, Vote vote) { + addVoteFeedEntry(question.getPoll(), vote, n("pollen.service.feed.voteDeleted.title")); } public void onCommentAdded(Poll poll, Comment comment) { @@ -126,6 +127,21 @@ public class FeedService extends PollenServiceSupport { addFeedEntry(poll, t("pollen.service.feed.commentDeleted.title", comment.getAuthor())); } + public void onCommentAdded(Question question, Comment comment) { + //FIXME JC181002 - FeedEntry spécifique pour questions + addFeedEntry(question.getPoll(), t("pollen.service.feed.commentAdded.title", comment.getAuthor())); + } + + public void onCommentEdited(Question question, Comment comment) { + //FIXME JC181002 - FeedEntry spécifique pour questions + addFeedEntry(question.getPoll(), t("pollen.service.feed.commentEdited.title", comment.getAuthor())); + } + + public void onCommentDeleted(Question question, Comment comment) { + //FIXME JC181002 - FeedEntry spécifique pour questions + addFeedEntry(question.getPoll(), t("pollen.service.feed.commentDeleted.title", comment.getAuthor())); + } + public SyndFeed getFeedForPoll(String pollId) { checkNotNull(pollId); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.