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 154445661b7e19c7c789e1313e843dea3e34017f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Dec 30 20:29:43 2016 +0100 fixes #8674: Méthodes de mesures du protocole benthos non actives à la saisie dans l'onglet benthos --- .../catches/species/create/CreateSpeciesBatchUIHandler.java | 5 +++-- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 5f6e09a..8521f73 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -160,8 +160,9 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl source.setSelectedCategory(selectedCategory); // get species protocol to check the measurement method - SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesProtocol(getDataContext().getProtocol(), - newValue.getReferenceTaxonId()); + // poussin 20161230 fixes bug #8674 getSpeciesOrBenthosProtocol and not getSpeciesProtocol + SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesOrBenthosProtocol(getDataContext().getProtocol(), + newValue.getReferenceTaxonId()); CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode frequencyMode = null; if (speciesProtocol != null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index e377c33..33f00b9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -437,7 +437,12 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyUIModel model = getModel(); - taxonCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + // poussin 20161230 fixes bug #8674, add if to get right cache + if (SpeciesOrBenthosBatchUISupport.SPECIES.equals(ui.getSpeciesOrBenthosContext())) { + taxonCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + } else { + taxonCache = TaxonCaches.createBenthosCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + } Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); initBeanFilterableComboBox(this.ui.getLengthStepCaracteristicComboBox(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.