This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 46ac936bd5df09dfdce01781556bfa08e2091fb2 Author: jcouteau <couteau@codelutin.com> Date: Wed Apr 22 17:33:58 2020 +0200 Fix error when voting as an invited user --- .../main/java/org/chorem/pollen/services/service/VoteService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 5242f2d5..a9ab5730 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -49,6 +49,7 @@ import org.chorem.pollen.services.config.PollenServicesConfig; import org.chorem.pollen.services.service.security.PollenPermissions; import org.chorem.pollen.votecounting.VoteCounting; import org.chorem.pollen.votecounting.model.VoteCountingConfig; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.pagination.PaginationResult; import java.util.ArrayList; @@ -427,7 +428,7 @@ public class VoteService extends PollenServiceSupport { // si si le mainPrincipal a voté List<VoterListMember> voterListMembers = getVoterListMemberDao() .forEquals(VoterListMember.PROPERTY_MEMBER + "." + PollenPrincipal.PROPERTY_EMAIL, mainPrincipal.getEmail()) - .addEquals(VoterListMember.PROPERTY_VOTER_LIST + "." + VoterList.PROPERTY_POLL, question.getPoll().getTopiaId()) + .addEquals(VoterListMember.PROPERTY_VOTER_LIST + "." + VoterList.PROPERTY_POLL + "." + TopiaEntity.PROPERTY_TOPIA_ID, question.getPoll().getTopiaId()) .findAll(); @@ -439,7 +440,7 @@ public class VoteService extends PollenServiceSupport { // vote pour le connectedUser voterListMembers = getVoterListMemberDao() .forEquals(VoterListMember.PROPERTY_MEMBER + "." + PollenPrincipal.PROPERTY_POLLEN_USER, getConnectedUser()) - .addEquals(VoterListMember.PROPERTY_VOTER_LIST + "." + VoterList.PROPERTY_POLL, question.getPoll().getTopiaId()) + .addEquals(VoterListMember.PROPERTY_VOTER_LIST + "." + VoterList.PROPERTY_POLL + "." + TopiaEntity.PROPERTY_TOPIA_ID, question.getPoll().getTopiaId()) .findAll(); toSave.setVoterListMember(voterListMembers); toSave.setVoter(voterListMembers.get(0).getMember()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.