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 232209c91a5500cb4c175b209586dd871579da79 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 5 15:55:58 2015 +0100 on creation, question status is IN_PROGRESS --- .../fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 a8f6502..f68c0d1 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 @@ -132,7 +132,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { Privacy realPrivacy = privacy != null ? Privacy.valueOf(privacy.toUpperCase()) : Privacy.PRIVATE; questionEntity.setPrivacy(realPrivacy); - // On creation, Status is Open + // On creation, Status is IN_PROGRESS questionEntity.setStatus(Status.IN_PROGRESS); // Manage Dates : submission & deadline @@ -468,10 +468,6 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Retrieve all documents Collection<Document> questionDocuments = question.getRelatedDocuments(); if (documents != null && documents.length > 0) { - // now with expert documents, question is in progress - if (question.getStatus() == Status.OPEN) { - question.setStatus(Status.IN_PROGRESS); - } Set<Document> documentEntities = retrieveDocuments(Lists.newArrayList(documents)); // Manage restriction list for document with Privacy.RESTRICTED @@ -561,10 +557,10 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { Privacy realPrivacy = privacy != null ? Privacy.valueOf(privacy.toUpperCase()) : Privacy.PRIVATE; questionEntity.setPrivacy(realPrivacy); - // On creation, Status is Open + // On creation, Status is IN_PROGRESS if (inEdition) { String status = question.getStatus(); - questionEntity.setStatus(status != null ? Status.valueOf(status.toUpperCase()) : Status.OPEN); + questionEntity.setStatus(status != null ? Status.valueOf(status.toUpperCase()) : Status.IN_PROGRESS); // If it is a close or adjourn update, put a closing date, if it is a reopen, remove closing date if (Lists.newArrayList(Status.CLOSED.name(), Status.ADJOURNED.name()).contains(status) && questionEntity.getClosingDate() == null) { @@ -579,7 +575,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } } else { - questionEntity.setStatus(Status.OPEN); + questionEntity.setStatus(Status.IN_PROGRESS); } // Manage Dates : submission & deadline -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.