This is an automated email from the git hooks/post-receive script. New commit to branch feature/230_do_not_ask_for_gtu_validation_twice in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit d35b1638e39f6635db676cc3d7c5069a7dd67167 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 16 16:02:24 2019 +0200 Introduce methods in EditVote models 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 fa0c318a..3a97563f 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 @@ -119,7 +119,7 @@ </div> <div class="footer separator-top" if="{poll.questions[0] && poll.questions[0].choices && (poll.questions[0].canVote || voteInEdition)}"> <div class="current-voter-actions separator-right"> - <div class="o-form-element" if={!session.isConnected()}> + <div class="o-form-element" if={mustValidateGtuToVote()}> <label class="c-field c-field--choice gtu-validation"> <input type="checkbox" required> @@ -326,6 +326,10 @@ this.error = null; }; + this.mustValidateGtuToVote = () => { + return !this.session.isConnected(); + }; + this.getVote = () => { let vote; 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 e5a955c1..0246515f 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 @@ -106,7 +106,7 @@ </div> </Draggable> - <div class="o-form-element" if={!session.isConnected()}> + <div class="o-form-element" if={mustValidateGtuToVote()}> <label class="c-field c-field--choice gtu-validation"> <input type="checkbox" required> @@ -375,6 +375,10 @@ this.placeChoices(noAnim); }; + this.mustValidateGtuToVote = () => { + return !this.session.isConnected(); + }; + this.getVote = () => { let vote; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.