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 1c8848a90fe0ebbed6ad99e1d94a0bd4bfafe7d3 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 19:24:26 2014 +0100 question delete is not a delete, juste make question unavailable --- .../src/main/xmi/coselmar-model.zargo | Bin 9741 -> 10020 bytes .../coselmar/converter/BeanEntityConverter.java | 2 ++ .../coselmar/services/v1/QuestionsWebService.java | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coselmar-persistence/src/main/xmi/coselmar-model.zargo b/coselmar-persistence/src/main/xmi/coselmar-model.zargo index 9e32b2a..7b908f2 100644 Binary files a/coselmar-persistence/src/main/xmi/coselmar-model.zargo and b/coselmar-persistence/src/main/xmi/coselmar-model.zargo differ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index 1875092..67682d6 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -188,6 +188,7 @@ public class BeanEntityConverter { } } + result.setRestricted(question.isUnavailable()); return result; } @@ -229,6 +230,7 @@ public class BeanEntityConverter { } } + result.setRestricted(question.isUnavailable()); return result; } 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 92706ff..eafd6c7 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 @@ -77,6 +77,8 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // let's go Question questionEntity = getQuestionDao().create(); + questionEntity.setUnavailable(false); + // Question basics questionEntity.setTitle(question.getTitle()); @@ -273,7 +275,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { document.removeRestrictedList(participantGroup); } - getQuestionDao().delete(question); + // Question become unavailable + question.addAllContributors(participantGroup.getMembers()); + 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>.