branch feature/multi-ui updated (09223b66 -> a43dc5f5)
This is an automated email from the git hooks/post-receive script. New change to branch feature/multi-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 09223b66 Multi-questions : Results \o/ new 34668545 Fix voting problem in services new a43dc5f5 Add question title on vote page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a43dc5f59cd093af0c7b7358b6a3e681cc86caf4 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 29 10:02:43 2019 +0200 Add question title on vote page commit 34668545160f37ed11d9b8961ce172ecd535e430 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 29 09:47:00 2019 +0200 Fix voting problem in services Summary of changes: .../src/main/java/org/chorem/pollen/services/service/VoteService.java | 4 ++-- pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/multi-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 34668545160f37ed11d9b8961ce172ecd535e430 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 29 09:47:00 2019 +0200 Fix voting problem in services --- .../src/main/java/org/chorem/pollen/services/service/VoteService.java | 4 ++-- 1 file changed, 2 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 37e28754..3db11c61 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 @@ -427,7 +427,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, question.getPoll()) .findAll(); @@ -439,7 +439,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, question.getPoll()) .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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/multi-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a43dc5f59cd093af0c7b7358b6a3e681cc86caf4 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 29 10:02:43 2019 +0200 Add question title on vote page --- pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html index 671162b5..842db92f 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Vote.tag.html @@ -21,6 +21,8 @@ <Vote> <div class="container" show="{loaded}"> + <h2>{question.title}</h2> + <span class="c-input-group actions-right" if={isVoteByOrder}> <button class="c-button c-button--info {c-button--ghost-info: !voteClickAndDrop, c-button--info: voteClickAndDrop}" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm