branch develop updated (fae4d21 -> bb564b0)
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 fae4d21 Display corrections & add media queries new bb564b0 internal-test #6654 be bale to remove deadline for project 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 bb564b0235685ae010888a290b27b6eac2bae2a7 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Feb 13 10:47:13 2015 +0100 internal-test #6654 be bale to remove deadline for project Summary of changes: .../java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java | 7 ++++++- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) -- 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 bb564b0235685ae010888a290b27b6eac2bae2a7 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Feb 13 10:47:13 2015 +0100 internal-test #6654 be bale to remove deadline for project --- .../java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java | 7 ++++++- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index b7aab6e..6c058a9 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -480,7 +480,12 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { documentEntity.setType(document.getType()); documentEntity.setSummary(document.getSummary()); documentEntity.setLanguage(document.getLanguage()); - documentEntity.setPublicationDate(document.getPublicationDate()); + Date publicationDate = document.getPublicationDate(); + if (publicationDate != null) { + documentEntity.setPublicationDate(new Date(publicationDate.getTime())); + } else { + documentEntity.setPublicationDate(null); + } // Legal / copyright part documentEntity.setAuthors(document.getAuthors()); 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 f68c0d1..e560089 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 @@ -589,6 +589,8 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { Date deadline = question.getDeadline(); if (deadline != null) { questionEntity.setDeadline(new Date(deadline.getTime())); + } else { + questionEntity.setDeadline(null); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm