This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 0cbc2651d9f12e9d7192f8184c6379343f0962f6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 2 16:08:53 2014 +0200 clone voterList --- .../pollen/services/service/PollService.java | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 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 ffdbf77..e35d911 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 @@ -26,11 +26,7 @@ package org.chorem.pollen.services.service; import com.google.common.base.Function; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.*; -import org.chorem.pollen.services.bean.ChoiceBean; -import org.chorem.pollen.services.bean.PaginationParameterBean; -import org.chorem.pollen.services.bean.PaginationResultBean; -import org.chorem.pollen.services.bean.PollBean; -import org.chorem.pollen.services.bean.PollenEntityRef; +import org.chorem.pollen.services.bean.*; import org.chorem.pollen.services.service.security.PermissionVerb; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -219,7 +215,10 @@ public class PollService extends PollenServiceSupport { checkNotNull(pollId); checkPermission(PermissionVerb.clonePoll, pollId); - PollBean clonedPoll = toBean(PollBean.class, getPoll0(pollId)); + Poll poll = getPoll0(pollId); + + // Clone Poll + PollBean clonedPoll = toBean(PollBean.class, poll); clonedPoll.setEntityId(null); clonedPoll.setPermission(null); @@ -231,6 +230,7 @@ public class PollService extends PollenServiceSupport { clonedPoll.setTitle(clonedPoll.getTitle() + " (clone)"); + // Clone Choice List<ChoiceBean> clonedChoices = getChoiceService().getChoices(pollId); for (ChoiceBean choice : clonedChoices) { choice.setEntityId(null); @@ -238,6 +238,20 @@ public class PollService extends PollenServiceSupport { } Poll savedPoll = savePoll(clonedPoll, clonedChoices); + + //clone VoterList + List<VoterListBean> clonedVoterList = toBeanList(VoterListBean.class, getVoterListService().getVoterLists0(poll)); + for (VoterListBean voterList : clonedVoterList) { + List<VoterListMemberBean> clonedVoterListMember = toBeanList(VoterListMemberBean.class , getVoterListService().getVoterListMembers0(voterList.toEntity())); + + voterList.setEntityId(null); + VoterList savedVoterList = getVoterListService().saveVoterList(savedPoll, voterList); + + for (VoterListMemberBean member : clonedVoterListMember) { + member.setEntityId(null); + getVoterListService().saveVoterListMember(savedVoterList, member); + } + } commit(); getNotificationService().onPollCreated(savedPoll); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.