branch feature/13_manage_poll created (now 659bf95)
This is an automated email from the git hooks/post-receive script. New change to branch feature/13_manage_poll in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git at 659bf95 refs #13 the poll owner can delete the votes This branch includes the following new commits: new 2aa7cc9 refs #13 add permission to delete votes to poll owner new 659bf95 refs #13 the poll owner can delete the votes 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 659bf95710b7ca85171e853309b6de8fee28dbbb Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 20 16:06:50 2017 +0200 refs #13 the poll owner can delete the votes commit 2aa7cc97376fbbd8d572e498f367f29c8fa255b6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 20 16:04:14 2017 +0200 refs #13 add permission to delete votes to poll owner -- 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/13_manage_poll in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2aa7cc97376fbbd8d572e498f367f29c8fa255b6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 20 16:04:14 2017 +0200 refs #13 add permission to delete votes to poll owner --- .../org/chorem/pollen/services/service/security/SecurityService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 6bee564..166ffea 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -617,6 +617,7 @@ public class SecurityService extends PollenServiceSupport { if (CollectionUtils.isNotEmpty(votes)) { for (Vote vote : votes) { permissions.add(createSubjectPermission(PermissionVerb.readVote, vote)); + permissions.add(createSubjectPermission(PermissionVerb.deleteVote, vote)); } } } -- 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/13_manage_poll in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 659bf95710b7ca85171e853309b6de8fee28dbbb Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 20 16:06:50 2017 +0200 refs #13 the poll owner can delete the votes --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 daf7f48..983024c 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 @@ -139,15 +139,16 @@ require("./Podium.tag.html"); value={poll.getVoteValue(vote, choice)}> </div> <div class="vote-actions"> - <span class="c-input-group" - if="{!poll.isClosed && vote.permission && (!voteId || voteId != vote.id)}"> + <span class="c-input-group"> <button type="button" - class="c-button c-button--error" + class="c-button c-button--error" + if="{(poll.permission || !poll.isClosed && vote.permission) && (!voteId || voteId != vote.id)}" onclick="{parent.deleteVote(vote)}"> <i class="fa fa-trash"/> </button> <button type="button" - class="c-button c-button--brand" + class="c-button c-button--brand" + if="{!poll.isClosed && vote.permission && (!voteId || voteId != vote.id)}" onclick="{parent.onEditVote(vote)}"> <i class="fa fa-pencil-square-o"/> </button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm