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 372075ac86747870bdad5bd12a28056a291a18fb Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jun 19 11:46:27 2014 +0200 fix convert Bean to Entity, and get voterListMember when edit voterList --- .../main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java | 1 + .../main/java/org/chorem/pollen/services/service/VoterListService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java index b778ce0..c9d630e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java @@ -56,6 +56,7 @@ public class VoterListMemberBean extends PollenBean<VoterListMember> { public VoterListMember toEntity() { VoterListMember entity = new VoterListMemberImpl(); + entity.setTopiaId(getEntityId()); entity.setEmail(getEmail()); entity.setName(getName()); entity.setWeight(getWeight()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index 868f2b0..8526432 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -181,8 +181,9 @@ public class VoterListService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); List<VoterList> existingVoterLists = getVoterLists0(poll); + List<VoterListMember> existingVoterListMembers = getVoterListMembers0(voterList.toEntity()); - ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, null); + ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, toBeanList(VoterListMemberBean.class, existingVoterListMembers)); errorMap.failIfNotEmpty(); VoterList result = saveVoterList(poll, voterList); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.