This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit ea3e43ef4f5721b7c1b919205d7f712d1c77cd3f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 19 16:54:56 2015 +0100 little fix on questions desactivation --- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 4c7e21c..c0aa53d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -272,7 +272,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { String userRole = userWebToken.getRole(); if (!StringUtils.equalsIgnoreCase(CoselmarUserRole.SUPERVISOR.name(), userRole) - && StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole)) { + && !StringUtils.equalsIgnoreCase(CoselmarUserRole.ADMIN.name(), userRole)) { String message = String.format("User %s %s ('%s') is not allowed to delete question", userWebToken.getFirstName(), userWebToken.getLastName(), userWebToken.getUserId()); if (log.isWarnEnabled()) { @@ -307,12 +307,12 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { document.removeRestrictedList(participantGroup); } question.addAllContributors(participantGroup.getMembers()); + getPersistenceContext().getCoselmarUserGroupDao().delete(participantGroup); } // Question become unavailable question.setUnavailable(true); - getPersistenceContext().getCoselmarUserGroupDao().delete(participantGroup); commit(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.