branch develop updated (d8f4922 -> ea3e43e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from d8f4922 add error on modal when no file and no externalURL given for document internal-test #6682 new ea3e43e little fix on questions desactivation 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 ea3e43ef4f5721b7c1b919205d7f712d1c77cd3f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 19 16:54:56 2015 +0100 little fix on questions desactivation Summary of changes: .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm