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 8cb1ed6ce077e8a0c9138d765c82d3d12da2bd50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 18:17:22 2016 +0200 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) --- .../longline/HooksCompositionDto-ui-update-error-validation.xml | 7 +------ .../resources/i18n/application-swing-validation_en_GB.properties | 1 - .../resources/i18n/application-swing-validation_es_ES.properties | 1 - .../resources/i18n/application-swing-validation_fr_FR.properties | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml index b8d4ed6..2004d3c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml @@ -43,15 +43,10 @@ <field name="hookSize"> - <!-- pas de hookSize selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.hooksComposition.required.hookSize</message> - </field-validator> - <!-- hookSize desactive --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ hookSize.enabled ]]> + <![CDATA[ hookSize == null || hookSize.enabled ]]> </param> <message>validator.ui.hooksComposition.desactivated.hookSize</message> </field-validator> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index 64b7d91..342d9ea 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=Hook offset must be between %1$s validator.ui.hooksComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.ui.hooksComposition.desactivated.hookSize=Selected hook size is disabled. validator.ui.hooksComposition.desactivated.hookType=Selected hook type is disabled. -validator.ui.hooksComposition.required.hookSize=Hook size must be filled. validator.ui.hooksComposition.required.hookType=Hook type must be filled. validator.ui.hooksComposition.required.proportion=Proportion must be filled. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index bbe39e2..c2b032d 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=El offset debe ser entre %s y %s. validator.ui.hooksComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.hooksComposition.desactivated.hookSize=El tamaño de avanzuelo seleccionado está desactivado. validator.ui.hooksComposition.desactivated.hookType=El tipo de avanzuelo seleccionado está desactivado. -validator.ui.hooksComposition.required.hookSize=La selección de un tamaño de avanzuelo es mandatoria. validator.ui.hooksComposition.required.hookType=La selección de un tipo de avanzuelo es mandatoria. validator.ui.hooksComposition.required.proportion=La proporción está vacía. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index a9e521f..8deaffe 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=L'offset doit être compris entre validator.ui.hooksComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.hooksComposition.desactivated.hookSize=La taille d'hameçon sélectionné est désactivée. validator.ui.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. -validator.ui.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. validator.ui.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. validator.ui.hooksComposition.required.proportion=Proportion non renseignée. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.