This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8a74ea25270a0397e67e8c5e80ce53394914ac75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 12:16:07 2015 +0200 Ne pas accepter un import de taxon si le referenceTaxonId est null (refs #7047) --- .../referential/consumer/CsvConsumerForTemporarySpecies.java | 10 ++++++++-- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java index d40605e..d664ed9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java @@ -121,7 +121,7 @@ public class CsvConsumerForTemporarySpecies extends CsvComsumer<SpeciesRow, Spec addCheckError(row, new ApplicationBusinessException(t("tutti.service.referential.import.species.error.idNotTemporary", id))); - }else if (requestResult.isIdAlreadyAdded(id)) { + } else if (requestResult.isIdAlreadyAdded(id)) { addCheckError(row, new ApplicationBusinessException(t("tutti.service.referential.import.species.error.id.alreaydAdded", id))); @@ -131,12 +131,18 @@ public class CsvConsumerForTemporarySpecies extends CsvComsumer<SpeciesRow, Spec addCheckError(row, new ApplicationBusinessException(t("tutti.service.referential.import.species.error.noName"))); - }else if (requestResult.isNaturalIdAlreadyAdded(name)) { + } else if (requestResult.isNaturalIdAlreadyAdded(name)) { addCheckError(row, new ApplicationBusinessException(t("tutti.service.referential.import.species.error.name.alreaydAdded", name))); } + if (bean.getReferenceTaxonId() == null) { + + addCheckError(row, new ApplicationBusinessException(t("tutti.service.referential.import.species.error.noReferencetTaxonId"))); + + } + } reportError(row); diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index 382ef25..396999d 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -391,6 +391,7 @@ tutti.service.referential.import.species.error.idNotTemporary= tutti.service.referential.import.species.error.name.alreaydAdded= tutti.service.referential.import.species.error.noId= tutti.service.referential.import.species.error.noName= +tutti.service.referential.import.species.error.noReferencetTaxonId= tutti.service.referential.import.species.error.notExistingId= tutti.service.referential.import.species.error.used= tutti.service.referential.import.species.idNotNegative.error= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 9a1805f..69b21d4 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -350,6 +350,7 @@ tutti.service.referential.import.species.error.idNotTemporary=L'identifiant %s n tutti.service.referential.import.species.error.name.alreaydAdded=Un taxon a déjà été importé avec ce nom %s tutti.service.referential.import.species.error.noId=Un identifiant temporaire de taxon est obligatoire tutti.service.referential.import.species.error.noName=Le nom pour l'espèce %s est obligatoire. +tutti.service.referential.import.species.error.noReferencetTaxonId=Le referenceTaxonId du taxon est obligatoire tutti.service.referential.import.species.error.notExistingId=L'identifiant '%s' n'a pas été trouvé parmi les espèces temporaires tutti.service.referential.import.species.error.used=L'espèce temporaire '%s' est utilisée dans l'application. Vous devez la remplacer pour pouvoir la supprimer. tutti.service.referential.import.species.idNotNegative.error=L'identifiant d'une espèce temporaire doit être négatif \: %s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.