This is an automated email from the git hooks/post-receive script. New commit to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git commit 76332cd6e6d64cec2aa58dc647fbeab33cc1d56a Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 10:25:50 2014 +0200 fix import favoriteList in voterList --- .../chorem/pollen/services/bean/VoterListMemberBean.java | 11 ++++++----- .../chorem/pollen/services/service/VoterListService.java | 16 ++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) 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 f2d35e4..0bbf458 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 @@ -21,6 +21,7 @@ package org.chorem.pollen.services.bean; * #L% */ +import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenPrincipalImpl; import org.chorem.pollen.persistence.entity.VoterListMember; import org.chorem.pollen.persistence.entity.VoterListMemberImpl; @@ -60,12 +61,12 @@ public class VoterListMemberBean extends PollenBean<VoterListMember> { VoterListMember entity = new VoterListMemberImpl(); entity.setTopiaId(getEntityId()); - if (entity.getMember() == null) { - entity.setMember(new PollenPrincipalImpl()); - } - entity.getMember().setEmail(getEmail()); - entity.getMember().setName(getName()); + PollenPrincipal member = new PollenPrincipalImpl(); + member.setEmail(getEmail()); + member.setName(getName()); + entity.setMember(member); + entity.setWeight(getWeight()); return entity; 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 cc85b2b..e0f0dc2 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 @@ -106,19 +106,23 @@ public class VoterListService extends PollenServiceSupport { VoterListMemberTopiaDao voterListMemberDao = getVoterListMemberDao(); + PollenPrincipalTopiaDao pollenPrincipalDao = + getPollenPrincipalDao(); List<FavoriteListMember> favoriteListMembers = getFavoriteListService().getFavoriteListMembers0(favoriteList); for (FavoriteListMember favoriteListMember : favoriteListMembers) { - VoterListMemberBean voterListMemberBean = new VoterListMemberBean(); - voterListMemberBean.setWeight(1d); - voterListMemberBean.setName(favoriteListMember.getName()); - voterListMemberBean.setEmail(favoriteListMember.getEmail()); + PollenPrincipal member = pollenPrincipalDao.create(); + member.setName(favoriteListMember.getName()); + member.setEmail(favoriteListMember.getEmail()); + VoterListMember voterListMember = voterListMemberDao.create(); - ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, voterListMemberBean); + voterListMember.setMember(member); + voterListMember.setWeight(1d); + + ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, toBean(VoterListMemberBean.class, voterListMember)); if (errorMap.isEmpty()) { // no error then create member - VoterListMember voterListMember = voterListMemberBean.toEntity(); voterListMember.setVoterList(result); voterListMemberDao.create(voterListMember); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.