branch develop updated (374c345 -> 8f4e350)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 374c345 fixes #8569: [ESPECES TEMPORAIRES] le processus de remplacement d'une espèce temporaire par une espèce du reftax ne marche pas menu desactive comme demande dans le ticket new 8f4e350 fixes #8613: [VALIDATION] transformer l'erreur "La strate, sous-strate ou localité doit être renseignée" en un warning basculement des erreurs en warning The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8f4e35050c18262fc83c4cef1ddbb5069395e65e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jan 4 21:09:47 2017 +0100 fixes #8613: [VALIDATION] transformer l'erreur "La strate, sous-strate ou localité doit être renseignée" en un warning basculement des erreurs en warning Summary of changes: .../FishingOperation-validate-error-validation.xml | 27 ---------------------- ...ishingOperation-validate-warning-validation.xml | 27 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 8f4e35050c18262fc83c4cef1ddbb5069395e65e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jan 4 21:09:47 2017 +0100 fixes #8613: [VALIDATION] transformer l'erreur "La strate, sous-strate ou localité doit être renseignée" en un warning basculement des erreurs en warning --- .../FishingOperation-validate-error-validation.xml | 27 ---------------------- ...ishingOperation-validate-warning-validation.xml | 27 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml b/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml index faf9606..062eb97 100644 --- a/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml +++ b/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml @@ -28,33 +28,6 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name='strata'> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ strata != null || subStrata != null || location != null ]]> - </param> - <message>tutti.validator.error.fishingOperation.strataLocation.required</message> - </field-validator> - </field> - - <field name='subStrata'> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ strata != null || subStrata != null || location != null ]]> - </param> - <message>tutti.validator.error.fishingOperation.strataLocation.required</message> - </field-validator> - </field> - - <field name='location'> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ strata != null || subStrata != null || location != null ]]> - </param> - <message>tutti.validator.error.fishingOperation.strataLocation.required</message> - </field-validator> - </field> - <field name="gearShootingStartDate"> <field-validator type="fieldexpression" short-circuit="true"> diff --git a/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml b/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml index e7ffff8..2de8799 100644 --- a/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml +++ b/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml @@ -29,6 +29,33 @@ <validators> + <field name='strata'> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ strata != null || subStrata != null || location != null ]]> + </param> + <message>tutti.validator.error.fishingOperation.strataLocation.required</message> + </field-validator> + </field> + + <field name='subStrata'> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ strata != null || subStrata != null || location != null ]]> + </param> + <message>tutti.validator.error.fishingOperation.strataLocation.required</message> + </field-validator> + </field> + + <field name='location'> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ strata != null || subStrata != null || location != null ]]> + </param> + <message>tutti.validator.error.fishingOperation.strataLocation.required</message> + </field-validator> + </field> + <field name="gearShootingStartDate"> <field-validator type="fieldexpression" short-circuit="true"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm