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 947c4f9ad54eac727d075c8a45eba5d14d103e23 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 24 16:59:12 2017 +0100 divvers petites corrections sur l'écran de vote et des options d'un sondage --- .../org/chorem/pollen/services/service/PollService.java | 5 +---- .../services/service/security/SecurityService.java | 16 +++++++++++++--- pollen-ui-riot-js/src/main/web/js/PollForm.js | 1 - 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index dc0c717..34df302 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -75,10 +75,7 @@ public class PollService extends PollenServiceSupport { input.setCommentIsVisible(isPermitted(PermissionVerb.readComment, input.getEntityId())); - boolean voteIsVisible = input.isVoteIsVisible() - && isPermitted(PermissionVerb.readVote, input.getEntityId()); - - input.setVoteIsVisible(voteIsVisible); + input.setVoteIsVisible(isPermitted(PermissionVerb.readVote, input.getEntityId())); boolean resultIsVisible = (input.isClosed() || input.isContinuousResults() 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 f02929e..39ad2e3 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 @@ -65,7 +65,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import java.io.IOException; import java.security.Security; import java.time.Clock; import java.time.LocalDateTime; @@ -600,8 +599,18 @@ public class SecurityService extends PollenServiceSupport { for (Poll poll : principalByType.polls) { // creator has all rights on the poll, choices and comments, but can only read votes - permissions.add(createWildcardSubjectPermission(poll)); - + permissions.add(createSubjectPermission(PermissionVerb.readPoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.editPoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.deletePoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.closePoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.clonePoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.closePoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.exportPoll, poll)); + permissions.add(createSubjectPermission(PermissionVerb.readComment, poll)); + permissions.add(createSubjectPermission(PermissionVerb.readPollResult, poll)); + permissions.add(createSubjectPermission(PermissionVerb.addChoice, poll)); + permissions.add(createSubjectPermission(PermissionVerb.addComment, poll)); + permissions.add(createSubjectPermission(PermissionVerb.addVote, poll)); // add comment permissions @@ -616,6 +625,7 @@ public class SecurityService extends PollenServiceSupport { List<Vote> votes = getVoteDao().forPollEquals(poll).findAll(); if (poll.getVoteVisibility() != VoteVisibility.ANONYMOUS) { + permissions.add(createSubjectPermission(PermissionVerb.readVote, poll)); if (CollectionUtils.isNotEmpty(votes)) { for (Vote vote : votes) { permissions.add(createSubjectPermission(PermissionVerb.readVote, vote)); diff --git a/pollen-ui-riot-js/src/main/web/js/PollForm.js b/pollen-ui-riot-js/src/main/web/js/PollForm.js index b3a7b3d..313057a 100644 --- a/pollen-ui-riot-js/src/main/web/js/PollForm.js +++ b/pollen-ui-riot-js/src/main/web/js/PollForm.js @@ -94,7 +94,6 @@ class PollForm { this.model.creatorName = user.name; this.model.creatorEmail = user.email; } - this.model.voteCountingType = 0; this.model.participant = []; this.choices = [new Choice("TEXT")]; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.