branch develop updated (8d703628 -> 9f823008)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 8d703628 suppression de l'attribut 'closed' sur le poll. On se base seulement sur la date de fin pour savori s'il est fermé. new 88d10be7 correction réouverture du sondage new ed37324d lien disabled ne fonctionne pas, donc verif dans la methode new 9f823008 suppression ou modif de vote impossible si le sondage est terminé The 3 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 9f823008d0b17f83a0ad4631faf32f422625f3ef Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:55:38 2017 +0200 suppression ou modif de vote impossible si le sondage est terminé commit ed37324d3c8f88ceb93f2499ac33f0fb522517eb Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:55:10 2017 +0200 lien disabled ne fonctionne pas, donc verif dans la methode commit 88d10be7a071a057ef148a91dc636f72608bba11 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:54:48 2017 +0200 correction réouverture du sondage Summary of changes: .../src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java | 2 +- .../src/main/web/tag/components/date-time-picker.tag.html | 6 ++++-- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 7 +++++-- 3 files changed, 10 insertions(+), 5 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 88d10be7a071a057ef148a91dc636f72608bba11 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:54:48 2017 +0200 correction réouverture du sondage --- .../src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java index b3dfda64..dcdc700f 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java @@ -170,7 +170,7 @@ public class PollApi { } @Path("/polls/{pollId}/reopen") - @POST + @PUT public void reopenPoll(@Context PollService pollService, @PathParam("pollId") PollenEntityId<Poll> pollId) { -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ed37324d3c8f88ceb93f2499ac33f0fb522517eb Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:55:10 2017 +0200 lien disabled ne fonctionne pas, donc verif dans la methode --- .../src/main/web/tag/components/date-time-picker.tag.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/components/date-time-picker.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/date-time-picker.tag.html index 0f02308c..02d240f9 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/date-time-picker.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/date-time-picker.tag.html @@ -64,8 +64,10 @@ require("./time-picker.tag.html"); }; this.reset = () => { - this.date.date = undefined; - this.time.time = undefined; + if (!this.opts.disabled) { + this.date.date = undefined; + this.time.time = undefined; + } }; </script> -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9f823008d0b17f83a0ad4631faf32f422625f3ef Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 1 18:55:38 2017 +0200 suppression ou modif de vote impossible si le sondage est terminé --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index ca39f8d3..45cd12f4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -120,14 +120,14 @@ require("../components/HumanInput.tag.html"); </div> <button type="button" class="c-button c-button--rounded u-xsmall c-button--brand" - if="{!poll.isClosed && vote.permission}" + if="{pollInProgress && vote.permission}" disabled="{voteInEdition != null}" onclick="{parent.onEditVote(vote)}"> <i class="fa fa-pencil-square-o"></i> </button> <button type="button" class="c-button c-button--rounded u-xsmall c-button--error" - if="{poll.permission || !poll.isClosed && vote.permission}" + if="{pollInProgress && (poll.permission || vote.permission)}" disabled="{voteInEdition != null}" onclick="{parent.deleteVote(vote)}"> <i class="fa fa-trash"></i> @@ -177,8 +177,10 @@ require("../components/HumanInput.tag.html"); const MIN_CHOICE_COLUMN_WIDTH = 100; this.loaded = false; let session = require("../../js/Session"); + let moment = require("moment"); let Choice = require("../../js/Choice"); this.installBundle(session, "poll_votes"); + this.pollInProgress = false; this.tooManyChoicesSelected = false; this.showChoiceHeader = true; this.voteTooltip = { @@ -189,6 +191,7 @@ require("../components/HumanInput.tag.html"); this.poll = require("../../js/Poll.js"); this.poll.loadVotes().then(() => { + this.pollInProgress = !this.poll.endDate || moment().isBefore(moment(this.poll.endDate)); this.updateShowChoiceContainer(); this.update(); }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm