Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dab9fdc8 by Tony Chemit at 2020-08-05T13:26:18+02:00 [PS] Contrôle de la saisie des espèces dans faune accessoire par systèmes observés (cas requin baleine) - See #1583 - - - - - 4f50f240 by Tony Chemit at 2020-08-05T13:26:19+02:00 update pom - - - - - e154abdc by Tony Chemit at 2020-08-05T13:26:19+02:00 Listes à choix multiples et mode permissif sur référentiels désactivés - Closes #1585 - - - - - ca258626 by Tony Chemit at 2020-08-05T13:31:08+02:00 Revert "update pom" This reverts commit 4f50f240 - - - - - 3 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -597,7 +597,7 @@ defaultValue = true description = observe.config.ui.seineBycatchObservedSystem.description key = ui.seineBycatchObservedSystem type = fr.ird.observe.validation.SeineBycatchObservedSystemConfig -defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\"]} +defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908\"]} [option temporaryFilesTimeout] description = observe.config.temporaryFilesTimeout.description ===================================== client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java ===================================== @@ -47,10 +47,11 @@ public class ClientConfigTest { { Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936"); Assert.assertNotNull(requiredObservedSystemBySpeciesId); - Assert.assertEquals(2, requiredObservedSystemBySpeciesId.size()); + Assert.assertEquals(3, requiredObservedSystemBySpeciesId.size()); Iterator<String> iterator = requiredObservedSystemBySpeciesId.iterator(); Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0", iterator.next()); Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1", iterator.next()); + Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908", iterator.next()); } { Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936_fake"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== @@ -721,8 +721,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); // by default always remove obsolete references - List<R> referentialReferences = DtoReferenceCollection.filterEnabled(incomingReferences); - log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + boolean validationDisabledReferential = ui.getConfig().isValidationDisabledReferential(); + List<R> referentialReferences = validationDisabledReferential ? new LinkedList<>(incomingReferences) : DtoReferenceCollection.filterEnabled(incomingReferences); + log.debug(String.format("Filter referential references (type %s - property %s), without disabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); //noinspection unchecked ReferentialReferencesFilter<D, R> referentialReferencesFilter = referentialsFilters.get(propertyName); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/11f90bbddfdada0212095cef5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/11f90bbddfdada0212095cef5... You're receiving this email because of your account on gitlab.com.