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 6e1730191d47e1b1bc0c4c83c3207ec56bdb3016 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 16 18:21:46 2019 +0200 Do not ask to validate GTU if already accepted by anonymous user refs #230 --- pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html | 6 +++++- pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html | 6 +++++- 2 files changed, 10 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 0c96d116..952dc388 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 @@ -339,7 +339,11 @@ }; this.mustValidateGtuToVote = () => { - return !this.session.isConnected(); + let anonymousAlreadyVoted = this.voteInEdition; + let voterIsRegistered = this.session.isConnected(); + let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered; + let mustValidateGtuToVote = !gtuAlreadyValidated; + return mustValidateGtuToVote; }; this.getVote = () => { 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 22d912b3..e3fc412e 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 @@ -388,7 +388,11 @@ }; this.mustValidateGtuToVote = () => { - return !this.session.isConnected(); + let anonymousAlreadyVoted = this.voteInEdition; + let voterIsRegistered = this.session.isConnected(); + let gtuAlreadyValidated = anonymousAlreadyVoted || voterIsRegistered; + let mustValidateGtuToVote = !gtuAlreadyValidated; + return mustValidateGtuToVote; }; this.getVote = () => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.