branch develop updated (3fe4ce2f -> 7249b09f)
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 3fe4ce2f Merge branch 'feature/149-jugement-majoritaire' into develop new 7249b09f correction de l'id de la resource pour les choix de type resource 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 7249b09f0224a65820dec01eba009e1aff076893 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 10 15:52:22 2017 +0200 correction de l'id de la resource pour les choix de type resource Summary of changes: .../src/main/java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 7249b09f0224a65820dec01eba009e1aff076893 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 10 15:52:22 2017 +0200 correction de l'id de la resource pour les choix de type resource --- .../src/main/java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index af4a67ff..efdfb276 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -62,7 +62,7 @@ public class ChoiceService extends PollenServiceSupport { bean.setPermission(entity.getCreator().getPermission().getToken()); } - if (bean.getChoiceType() == ChoiceType.RESOURCE) { + if (entity.getChoiceType() == ChoiceType.RESOURCE) { bean.setChoiceValue(getPollenResourceService().getReduceIdByTopiaId(entity.getChoiceValue())); } else { bean.setChoiceValue(entity.getChoiceValue()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm