branch develop updated (d38aae13 -> 4e69bd02)
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 d38aae13 Merge branch 'feature/183-resultScore' into 'develop' new 4e69bd02 Le créateur est un participant du vote The 1 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 4e69bd02805de3bdb442157019f19ec7db1c4ae1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 2 11:17:57 2018 +0200 Le créateur est un participant du vote Summary of changes: .../chorem/pollen/services/service/security/SecurityService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 4e69bd02805de3bdb442157019f19ec7db1c4ae1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 2 11:17:57 2018 +0200 Le créateur est un participant du vote --- .../chorem/pollen/services/service/security/SecurityService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ceafb2a7..9748e54d 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 @@ -388,14 +388,14 @@ public class SecurityService extends PollenServiceSupport { return canRead(poll) && (isAdmin() || CommentVisibility.EVERYBODY.equals(poll.getCommentVisibility()) - || CommentVisibility.VOTER.equals(poll.getCommentVisibility()) && isVoter(poll) + || CommentVisibility.VOTER.equals(poll.getCommentVisibility()) && (isVoter(poll) || isCreator(poll)) || CommentVisibility.CREATOR.equals(poll.getCommentVisibility()) && isCreator(poll)); } public boolean canReadVotes(Poll poll) { return canRead(poll) && (VoteVisibility.EVERYBODY.equals(poll.getVoteVisibility()) - || VoteVisibility.VOTER.equals(poll.getVoteVisibility()) && isVoter(poll) + || VoteVisibility.VOTER.equals(poll.getVoteVisibility()) && (isVoter(poll) || isCreator(poll)) || VoteVisibility.CREATOR.equals(poll.getVoteVisibility()) && isCreator(poll)); } @@ -408,7 +408,7 @@ public class SecurityService extends PollenServiceSupport { return (Polls.isFinished(poll, getNow()) || poll.isContinuousResults()) && canRead(poll) && (ResultVisibility.EVERYBODY.equals(poll.getResultVisibility()) - || ResultVisibility.VOTER.equals(poll.getResultVisibility()) && isVoter(poll) + || ResultVisibility.VOTER.equals(poll.getResultVisibility()) && (isVoter(poll) || isCreator(poll)) || ResultVisibility.CREATOR.equals(poll.getResultVisibility()) && isCreator(poll)); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm