This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 15436d9bf52ffa5bbc2e4f6aaaa29098eca850f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 11:55:18 2016 +0200 Bien chargé le formulaire du référentiel --- .../java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java | 1 + .../java/fr/ird/observe/services/service/ReferentialServiceTopia.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index c15b241..dfff598 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -214,6 +214,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content if (selectedReference != null) { Form<E> form = getReferentialService().loadForm(getBeanType(), selectedReference.getId()); + getModel().setForm(form); E selectedBean = form.getObject(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 14ec415..56d5570 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -142,8 +142,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } ObserveReferentialEntity entity = loadEntity(type, id); - //FIXME Definir une definition pour chaque formulaire de référentiel - Form<D> form = referentialEntityToForm(type, entity, null); + ReferenceSetRequestDefinitions request = ReferenceSetRequestDefinitions.get(type); + Form<D> form = referentialEntityToForm(type, entity, request); D dto = form.getObject(); dto.setVersion(entity.getTopiaVersion()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.