Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0c43c46b by Tony CHEMIT at 2017-08-02T21:28:50+02:00 L'écran Senne Activité indique qu'il n'y a pas de dcp alors que j'en ai saisi un (See #812) - - - - - 3 changed files: - client-validation/pom.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml - services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java Changes: ===================================== client-validation/pom.xml ===================================== --- a/client-validation/pom.xml +++ b/client-validation/pom.xml @@ -31,7 +31,7 @@ <artifactId>client-validation</artifactId> - <name>ObServe :: client Validation</name> + <name>ObServe :: Client Validation</name> <description>ObServe Client Validation</description> <dependencies> ===================================== client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml ===================================== --- a/client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml +++ b/client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml @@ -49,7 +49,7 @@ <!-- Aucun DCP saisie --> <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ !dcpOperation || floatingObjectNotEmpty ]]></param> + <param name="expression"><![CDATA[ !dcpOperation || !floatingObjectEmpty ]]></param> <message>observe.validation.activity.null.dcp</message> </field-validator> ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java @@ -102,6 +102,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi dto.setNextFpaZone(toReferentialReference(referentialLocale, entity.getNextFpaZone(), FpaZoneDto.class)); dto.setSetSeine(toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class)); + dto.setFloatingObjectEmpty(entity.isFloatingObjectEmpty()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0c43c46b340c9e1cadf1c548423d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0c43c46b340c9e1cadf1c548423d... You're receiving this email because of your account on gitlab.com.