Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5179bd99 by Tony Chemit at 2020-05-08T12:29:17+02:00 [PS] Affichage altéré/tronqué en 7.5.1 (régression) - Closes #1473 - - - - - 4 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-warning-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-error-validation.xml ===================================== @@ -25,9 +25,36 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="species"> + <!-- species is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- SpeciesReference disabled --> + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> + <!-- weightCategory is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- WeightCategoryReference disabled --> + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="well"> + <!-- well is a mandatory string --> <field-validator type="mandatoryString" short-circuit="true"> <message/> </field-validator> </field> + <field name="catchWeight"> + <!-- catchWeight is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-warning-validation.xml ===================================== @@ -25,6 +25,18 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <!-- SpeciesReference disabled --> + <field name="species"> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <!-- WeightCategoryReference disabled --> + <field name="weightCategory"> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="catchWeight"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-error-validation.xml ===================================== @@ -25,7 +25,38 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="species"> + <!-- species is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- SpeciesReference disabled --> + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> + <!-- weightCategory is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- WeightCategoryReference disabled --> + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="reasonForDiscard"> + <!-- reasonForDiscard is mandatory --> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- ReasonForDiscardReference disabled --> + <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="catchWeight"> + <!-- catchWeight is mandatory --> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-warning-validation.xml ===================================== @@ -23,6 +23,25 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + + <field name="species"> + <!-- SpeciesReference disabled --> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="weightCategory"> + <!-- WeightCategoryReference disabled --> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="reasonForDiscard"> + <!-- ReasonForDiscardReference disabled --> + <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true"> + <message/> + </field-validator> + </field> <field name="catchWeight"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5179bd999663224d3eeb83a6d2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5179bd999663224d3eeb83a6d2... You're receiving this email because of your account on gitlab.com.