This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 28a498bdfe832c1fd4136f58e4e4a0f063473288 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 15:30:00 2014 +0200 add permission addChoice, check choice type DATE no fail if choiceValue == null fix pollBeanFunction --- .../chorem/pollen/services/service/ChoiceService.java | 12 ++++-------- .../org/chorem/pollen/services/service/PollService.java | 16 ---------------- .../services/service/security/SecurityService.java | 4 ++++ 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index d8dcf14..b081f6a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -114,7 +114,7 @@ public class ChoiceService extends PollenServiceSupport { checkNotNull(pollId); checkNotNull(choice); checkIsNotPersisted(choice); - checkPermission(PermissionVerb.editPoll, pollId); + checkPermission(PermissionVerb.addChoice, pollId); Poll poll = getPollService().getPoll0(pollId); List<Choice> existingChoices = getChoiceDao().findAll(poll); @@ -323,17 +323,13 @@ public class ChoiceService extends PollenServiceSupport { Date choiceDate = null; if (choice.getChoiceValue() != null) { choiceDate = new Date(Long.parseLong(choice.getChoiceValue())); - } - - boolean dateNotBlank = checkNotBlank(errors, - "choiceValue", - String.valueOf(choiceDate), - l(getLocale(), "pollen.error.choice.choiceDateEmpty")); - if (dateNotBlank) { boolean dateAdded = choiceNames.add(String.valueOf(choiceDate.getTime())); check(errors, "choiceValue", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); } + else { + check(errors, "choiceValue", false, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + } break; 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 7c28055..409a4f2 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 @@ -62,22 +62,6 @@ public class PollService extends PollenServiceSupport { input.setResultIsVisible(isPermitted(PermissionVerb.readPollResult, input.getEntityId())); - if (input.isChoiceAddAllowed()) { - Date endDate = input.getEndChoiceDate(); - if (endDate == null) { - endDate = input.getEndDate(); - if (endDate == null) { - input.setAddChoiceAllowed(true); - } - } - - if (endDate != null) { - input.setAddChoiceAllowed(endDate.compareTo(serviceContext.getNow()) > 0); - } - } else { - input.setAddChoiceAllowed(false); - } - return input; } }; 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 6ae0d90..2fb04c8 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 @@ -382,6 +382,10 @@ public class SecurityService extends PollenServiceSupport { permissions.add(createSubjectPermission(PermissionVerb.readPollResult, poll)); } + if (poll.isChoiceAddAllowed()) { + permissions.add(createSubjectPermission(PermissionVerb.addChoice, poll)); + } + // add choices permissions List<Choice> choices = getChoiceDao().forPollEquals(poll).findAll(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.