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>.