branch feature/refonte-ui updated (271a14a7 -> 2376d098)
This is an automated email from the git hooks/post-receive script. New change to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 271a14a7 Refonte ui : ajout de nouveaux filtres pour la récupération des sondages new 2376d098 Ajout d'un nouvel attribut au sondage (image d'illustration) 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 2376d098bf3444420202e9150234c6ea44fa06e0 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Jul 1 11:45:49 2020 +0200 Ajout d'un nouvel attribut au sondage (image d'illustration) Summary of changes: .../db/migration/h2/V3_3_0_2__add_poll_picture.sql | 5 +++++ .../postgresql/V3_3_0_2__add_poll_picture.sql | 5 +++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 31242 -> 31337 bytes .../org/chorem/pollen/services/bean/PollBean.java | 10 ++++++++++ .../chorem/pollen/services/service/PollService.java | 2 ++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql -- 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 feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2376d098bf3444420202e9150234c6ea44fa06e0 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Jul 1 11:45:49 2020 +0200 Ajout d'un nouvel attribut au sondage (image d'illustration) --- .../db/migration/h2/V3_3_0_2__add_poll_picture.sql | 5 +++++ .../postgresql/V3_3_0_2__add_poll_picture.sql | 5 +++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 31242 -> 31337 bytes .../org/chorem/pollen/services/bean/PollBean.java | 10 ++++++++++ .../chorem/pollen/services/service/PollService.java | 2 ++ 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql b/pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql new file mode 100644 index 00000000..6d0f6742 --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/h2/V3_3_0_2__add_poll_picture.sql @@ -0,0 +1,5 @@ +-- +-- Ajout de la colonne Picture dans la table Poll +-- +ALTER TABLE poll ADD picture VARCHAR(255); +alter table poll ADD FOREIGN KEY (picture) REFERENCES PollenResource(topiaId); diff --git a/pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql new file mode 100644 index 00000000..6d0f6742 --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_3_0_2__add_poll_picture.sql @@ -0,0 +1,5 @@ +-- +-- Ajout de la colonne Picture dans la table Poll +-- +ALTER TABLE poll ADD picture VARCHAR(255); +alter table poll ADD FOREIGN KEY (picture) REFERENCES PollenResource(topiaId); diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index a2207c6b..d4e322a6 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ###m -model.tagvalue.version=3.3.0.1 +model.tagvalue.version=3.3.0.2 #model.tagValue.notGenerateToString=true #model.tagValue.constantPrefix=PROPERTY_ #model.tagValue.useEnumerationName=true diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index 8f5565aa..0883a4a6 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/bean/PollBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java index 114ba0a7..4bb92c1a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java @@ -132,6 +132,8 @@ public class PollBean extends PollenBean<Poll> { protected List<String> emailAddressSuffixes; protected List<QuestionBean> questions; + + protected String picture; public String getPermission() { return permission; @@ -427,4 +429,12 @@ public class PollBean extends PollenBean<Poll> { } this.questions.add(question); } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } } 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 3f3e5940..1a17922c 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,6 +110,7 @@ public class PollService extends PollenServiceSupport { bean.setCommentNotification(entity.isCommentNotification()); bean.setNewChoiceNotification(entity.isNewChoiceNotification()); bean.setNotificationLocale(entity.getNotificationLocale()); + bean.setPicture(entity.getPicture()); String emailAddressSuffixes = entity.getEmailAddressSuffixes(); if (StringUtils.isNotBlank(emailAddressSuffixes)) { bean.setEmailAddressSuffixes(Lists.newArrayList(emailAddressSuffixes.split(PollService.EMAIL_SUFFIX_SEPARATOR))); @@ -558,6 +559,7 @@ public class PollService extends PollenServiceSupport { toSave.setNewChoiceNotification(poll.isNewChoiceNotification()); toSave.setNotifyMeHoursBeforePollEnds(poll.getNotifyMeHoursBeforePollEnds()); toSave.setNotificationLocale(poll.getNotificationLocale()); + toSave.setPicture(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