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 7c0fb4af5d12887aa6327faea51dc00c00a053d7 Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 29 11:35:00 2019 +0100 GTU validation in multi/invited poll --- pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html | 3 ++- pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html index 9a973a9e..1eaf428e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html @@ -369,7 +369,8 @@ this.mustValidateGtuToVote = () => { let anonymousAlreadyVoted = this.voteInEdition; let voterIsRegistered = this.session.isConnected(); - let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered; + let gtuValidatedInPoll = this.poll.gtuValidated; + let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered || gtuValidatedInPoll; let mustValidateGtuToVote = !gtuAlreadyValidated; return mustValidateGtuToVote; }; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html index 05a0684b..81ccc462 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html @@ -390,7 +390,8 @@ this.mustValidateGtuToVote = () => { let anonymousAlreadyVoted = this.voteInEdition; let voterIsRegistered = this.session.isConnected(); - let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered; + let gtuValidatedInPoll = this.poll.gtuValidated; + let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered || gtuValidatedInPoll; let mustValidateGtuToVote = !gtuAlreadyValidated; return mustValidateGtuToVote; }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.