This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 17eed995ab9e70a7ad3a5ebf1ba7a5c40dbdb8e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 13 15:17:18 2015 +0200 Ajout de startDate dans la clef d'unicité (refs #7216) --- ...hWeightParameter-n1-create-error-validation.xml | 34 ++++++++++++++-------- ...hWeightParameter-n1-update-error-validation.xml | 34 ++++++++++++++-------- .../i18n/observe-validation_fr_FR.properties | 2 +- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml index 5c55c11..12a8244 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml @@ -45,31 +45,41 @@ <message>validator.lengthWeightParameter.required.species</message> </field-validator> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> <field name="ocean"> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> <field name="sex"> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml index e8741c7..cc3a121 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml @@ -45,31 +45,41 @@ <message>validator.lengthWeightParameter.required.species</message> </field-validator> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> <field name="ocean"> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> <field name="sex"> - <!-- clef unique species - gender - ocean --> - <field-validator type="collectionUniqueKey" short-circuit="true"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> - <param name="keys">species,sex,ocean</param> - <param name="againstMe">true</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> <message>validator.lengthWeightParameter.invalid.uniqueKey</message> </field-validator> </field> diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 722135e..9512571 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -132,7 +132,7 @@ validator.hooksComposition.required.hookSize=La sélection d'une taille d'hameç validator.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. validator.hooksComposition.required.proportion=Proportion non renseignée. validator.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. -validator.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species) doit être unique, le tuple est déjà utilisé. +validator.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species/startDate) doit être unique, le tuple est déjà utilisé. validator.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. validator.lengthWeightParameter.null.ocean=Aucun océan sélectionné. validator.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.