branch develop updated (fee354e7 -> ba7fb6bf)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from fee354e7 fix poll#picture type in uml new ba7fb6bf fix poll#picture relation 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 ba7fb6bf94bd7b7faaf0aafb24fd5b00afdb48cf Author: Cécilia Bossard <bossard@codelutin.com> Date: Thu Jul 2 18:10:01 2020 +0200 fix poll#picture relation Summary of changes: data /db/pollen-rest-api.mv.db | Bin 0 -> 688128 bytes pollen-persistence/src/main/xmi/pollen.zargo | Bin 31302 -> 31876 bytes .../chorem/pollen/services/service/PollService.java | 10 +++++++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 data /db/pollen-rest-api.mv.db -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ba7fb6bf94bd7b7faaf0aafb24fd5b00afdb48cf Author: Cécilia Bossard <bossard@codelutin.com> Date: Thu Jul 2 18:10:01 2020 +0200 fix poll#picture relation --- data /db/pollen-rest-api.mv.db | Bin 0 -> 688128 bytes pollen-persistence/src/main/xmi/pollen.zargo | Bin 31302 -> 31876 bytes .../chorem/pollen/services/service/PollService.java | 10 +++++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data /db/pollen-rest-api.mv.db b/data /db/pollen-rest-api.mv.db new file mode 100644 index 00000000..04c34432 Binary files /dev/null and b/data /db/pollen-rest-api.mv.db differ diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 7ede3973..90e5637b 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 28a70a5c..a46f53da 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -110,7 +110,10 @@ public class PollService extends PollenServiceSupport { bean.setCommentNotification(entity.isCommentNotification()); bean.setNewChoiceNotification(entity.isNewChoiceNotification()); bean.setNotificationLocale(entity.getNotificationLocale()); - bean.setPicture(entity.getPicture()); + if(entity.getPicture() != null) { + bean.setPicture(getPollenResourceService().getReduceIdByTopiaId( + entity.getPicture().getTopiaId())); + } String emailAddressSuffixes = entity.getEmailAddressSuffixes(); if (StringUtils.isNotBlank(emailAddressSuffixes)) { bean.setEmailAddressSuffixes(Lists.newArrayList(emailAddressSuffixes.split(PollService.EMAIL_SUFFIX_SEPARATOR))); @@ -584,8 +587,9 @@ public class PollService extends PollenServiceSupport { toSave.setNewChoiceNotification(poll.isNewChoiceNotification()); toSave.setNotifyMeHoursBeforePollEnds(poll.getNotifyMeHoursBeforePollEnds()); toSave.setNotificationLocale(poll.getNotificationLocale()); - toSave.setPicture(poll.getPicture()); - + if(StringUtils.isNotBlank(poll.getPicture())) { + toSave.setPicture(getPollenResourceService().getResource0(getPollenResourceService().getTopiaIdByReduceId(poll.getPicture()))); + } toSave.setBeginDate(poll.getBeginDate()); toSave.setEndDate(poll.getEndDate()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm