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 8fd25d63f9f4375f6386d5c3dd1d252bea0785cd Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 8 12:09:58 2019 +0100 refs #233 : Fix missing questions and choices when getting saved poll --- .../main/java/org/chorem/pollen/services/service/PollService.java | 7 +++++-- .../java/org/chorem/pollen/services/service/QuestionService.java | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index d6e87458..d10e0b32 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -21,13 +21,11 @@ package org.chorem.pollen.services.service; * #L% */ -import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; -import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollType; @@ -135,6 +133,11 @@ public class PollService extends PollenServiceSupport { } } + /** Questions and choices **/ + QuestionService questionService = getQuestionService(); + List<QuestionBean> questions = questionService.getQuestions(bean.getEntityId()); + bean.setQuestions(questions); + if (isNotPermitted(PollenPermissions.edit(entity))) { bean.setPermission(null); bean.setCreatorEmail(null); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java index 2d4b6774..c19fca5a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/QuestionService.java @@ -47,6 +47,11 @@ public class QuestionService extends PollenServiceSupport { bean.setCreateDate(entity.getTopiaCreateDate()); bean.setVoteCountingConfig(getVoteCountingService().getVoteCountingConfig(entity)); + /** Questions and choices **/ + ChoiceService choiceService = getChoiceService(); + List<ChoiceBean> choices = choiceService.getChoices(bean.getEntityId()); + bean.setChoices(choices); + if (isNotPermitted(PollenPermissions.edit(entity))) { bean.setPermission(null); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.