This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 910cc5d0665a7fec76d6b07bf45d9e15e9360976 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 09:43:43 2015 +0200 Correction de la liste des oceans sur l'écran d'édition d'une espèce (See #7610) --- .../src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx index e8238cc..fc83d15 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx @@ -263,7 +263,7 @@ <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}'> <FilterableDoubleList id='ocean' genericType='ReferenceDto<OceanDto>' - _entityClass='SpeciesDto.class'/> + _entityClass='OceanDto.class'/> </JScrollPane> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit b005c5b74624b9e51893f5973a671364bcfa5e73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:12:19 2015 +0200 Ajout FIXME pour kmorin --- .../java/fr/ird/observe/services/service/ReferentialServiceTopia.java | 1 + 1 file changed, 1 insertion(+) 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 e036e86..b6d2715 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 @@ -144,6 +144,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return result; } + //FIXME-kmorin Rename with method protected <E extends TopiaEntity, I extends IdDto> List<I> test(Class<I> dtoType, Class<E> type, EntityMap allUsages) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit f2f75b6d0eb90730ff833b979cad12a89a6832aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:13:12 2015 +0200 Nettoyage de code (See #7610) --- .../ref/ReferentialContentUIInitializer.java | 46 ++++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index a601fbb..5395e0a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.ref; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -39,6 +38,7 @@ import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; +import javax.swing.JComponent; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; @@ -69,14 +69,10 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } - @Override - protected <E1 extends IdDto> void updateData(BeanComboBox comboBox) { - ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); + protected void updateData(BeanComboBox comboBox) { - // init combobox - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(comboBox); Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); @@ -94,8 +90,7 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend data = new ArrayList<>(); // get complete data list from service - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); + ReferenceSetDto referentialReferenceSet = getReferentialService().getReferentialReferenceSet(dtoClass); LinkedHashSet<ReferenceDto> reference = referentialReferenceSet.getReference(); data.addAll(reference); @@ -110,18 +105,16 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(BeanListHeader list) { + protected void updateData(BeanListHeader list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); List<ReferenceDto> data = new ArrayList<>(referentialReferenceSet.getReference()); - Decorator<ReferenceDto> decorator = ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, - dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setData(data); @@ -129,14 +122,13 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(FilterableDoubleList list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + protected void updateData(FilterableDoubleList list) { + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); List<ReferenceDto> data; if (ReferentialDto.class.isAssignableFrom(dtoClass)) { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); data = new ArrayList<>(referentialReferenceSet.getReference()); @@ -148,11 +140,23 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } // sort data from first decorator context - ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setUniverse(data); list.putClientProperty("data", data); } + + protected ReferentialService getReferentialService() { + return ObserveSwingApplicationContext.get().newService(ReferentialService.class); + } + + protected Decorator<ReferenceDto> getDecorator(Class<? extends ReferentialDto> dtoClass) { + return ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + } + + protected Class<? extends ReferentialDto> getDtoClass(JComponent list) { + return (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 383dafe9e729b25f17340dcb2a933c1db151da59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:56:00 2015 +0200 Ajout d'une méthode de service pour récupérer aussi les champs techniques sur un set de référentiels --- .../v1/ReferentialServiceController.java | 5 ++ .../services/service/ReferentialService.java | 3 + .../services/service/ReferentialServiceTopia.java | 75 +++++++++++++++++----- 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 758ceb9..03cbf95 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -45,6 +45,11 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override + public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type, boolean loadTechnicalInformations) { + return service.getReferentialReferenceSet(type, loadTechnicalInformations); + } + + @Override public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type) { return service.getReferentialReferenceSet(type); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 4e2bd25..c283b5e 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -46,6 +46,9 @@ import java.util.Date; public interface ReferentialService extends ObserveService { @ReadReferentialPermission + <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type, boolean loadTechnicalInformations); + + @ReadReferentialPermission <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type); @ReadReferentialPermission 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 b6d2715..6055619 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 @@ -24,13 +24,17 @@ package fr.ird.observe.services.service; import com.google.common.base.Optional; import fr.ird.observe.entities.EntityMap; +import fr.ird.observe.entities.referentiel.ReferenceEntity; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.DtoMap; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; +import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; @@ -38,6 +42,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,8 +53,13 @@ import java.util.List; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { @Override - public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSet(Class<D> dtoType) { - return getReferenceSet(dtoType); + public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> dtoType) { + return getReferenceSet(dtoType, false); + } + + @Override + public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSet(Class<D> dtoType, boolean loadTechnicalInformations) { + return getReferenceSet(dtoType, loadTechnicalInformations); } @Override @@ -61,7 +71,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Optional<Date> lastUpdateOptional = getLastUpdate(entityType); if (lastUpdateOptional.isPresent() && lastUpdateOptional.get().after(updateAfter)) { - result = getReferenceSet(dtoType); + result = getReferenceSet(dtoType, false); } return result; @@ -77,24 +87,24 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferenceDto<D> loadReferenceToRead(Class<D> dtoType, String id) throws DataNotFoundException { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); ReferenceDto<D> form = entityToReferenceDto(dtoType, entity); return form; } @Override public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); return form; } @Override public <D extends ReferentialDto> FormDto<D> preCreate(Class<D> dtoType) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = newEntity(entityType); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); return form; @@ -102,8 +112,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> String save(D bean) { Class<D> dtoType = (Class<D>) bean.getClass(); - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = dtoToEntity(dtoType, entityType, bean); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = dtoToEntity(dtoType, entityType, bean); entity = saveEntity(entityType, entity); FormDto<D> model = entityToEditFormDto(dtoType, entityType, entity); return model.getForm().getId(); @@ -111,13 +121,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { - Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + Class<? extends ReferenceEntity> entityType = getEntityType(dtoType); deleteEntity(dtoType, entityType, Collections.singleton(id)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { - Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + Class<? extends ReferenceEntity> entityType = getEntityType(dtoType); deleteEntity(dtoType, entityType, ids); } @@ -125,10 +135,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <R extends ReferentialDto> DtoMap findAllUsages(R bean) throws DataNotFoundException { Class<? extends IdDto> referentialDtoType = bean.getClass(); - Class<TopiaEntity> entityType = getEntityType(referentialDtoType); - TopiaEntity entity = loadEntity(referentialDtoType, entityType, bean.getId()); + Class<ReferenceEntity> entityType = getEntityType(referentialDtoType); + ReferenceEntity entity = loadEntity(referentialDtoType, entityType, bean.getId()); - TopiaDao<TopiaEntity> dao = getTopiaPersistenceContext().getDao(entityType); + TopiaDao<ReferenceEntity> dao = getTopiaPersistenceContext().getDao(entityType); EntityMap allUsages = new EntityMap(dao.findAllUsages(entity)); DtoMap result = new DtoMap(); @@ -156,4 +166,37 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } return dtos; } + + protected <D extends ReferentialDto, E extends ReferenceEntity> ReferenceSetDto<D> getReferenceSet( + Class<D> dtoType, + boolean loadTechnicalInformations) { + + Class<E> entityType = getEntityType(dtoType); + + Iterable<E> entities = loadEntities(entityType); + + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(); + for (E entity : entities) { + + ReferentialReferenceDto<D> dto = (ReferentialReferenceDto<D>) entityToReferenceDto(dtoType, entity); + + if (loadTechnicalInformations) { + + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdate(entity.getLastUpdate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + } + labels.add(dto); + + } + + Optional<Date> lastUpdateOptional = getLastUpdate(entityType); + + ReferenceSetDto<D> labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, null, labels, lastUpdateOptional.orNull()); + + return labelSetDto; + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 3afb71db6c4a0834fcba8ac55d70f7f1713275d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:14:09 2015 +0200 Plutot utiliser directement le flag enabled sur une référence de référentiel --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42833 -> 42827 bytes .../services/service/ReferentialServiceTopia.java | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index edf42cd..2919165 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ 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 6055619..9b087c5 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 @@ -66,7 +66,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSetIfModify(Class<D> dtoType, Date updateAfter) { ReferenceSetDto<D> result = null; - Class<TopiaEntity> entityType = getEntityType(dtoType); + Class<ReferenceEntity> entityType = getEntityType(dtoType); Optional<Date> lastUpdateOptional = getLastUpdate(entityType); @@ -79,9 +79,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToReadFormDto(dtoType, entityType, entity); + addTechnicalInformations(entity, form.getForm()); return form; } @@ -98,6 +99,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + addTechnicalInformations(entity, form.getForm()); return form; } @@ -185,7 +187,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setLastUpdate(entity.getLastUpdate()); - dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); } labels.add(dto); @@ -199,4 +201,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } + protected <D extends ReferentialDto> void addTechnicalInformations(ReferenceEntity entity, D dto) { + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdate(entity.getLastUpdate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 62172c456024ac4534462d903eb8fd8aeb38f234 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:15:33 2015 +0200 Chargement de la liste des référentiels avec leurs informations techniques --- .../ird/observe/ui/content/ref/ReferentialContentUIInitializer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index 5395e0a..1c43310 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -109,8 +109,9 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend Class<? extends ReferentialDto> dtoClass = getDtoClass(list); - ReferentialService service = getReferentialService(); - ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); + // Attention ici on charge les references avec aussi les données techniques + // On en a besoin pour l'écran justement des informations techniques d'une entité en cours d'édition + ReferenceSetDto referentialReferenceSet = getReferentialService().getReferentialReferenceSet(dtoClass, true); List<ReferenceDto> data = new ArrayList<>(referentialReferenceSet.getReference()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.