branch develop updated (0c6753d -> 6a3a870)
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 0c6753d Retour sur develop Merge branch 'feature/observations_individuelles-init_default_caracteristics' into develop new 6a3a870 inversion du chargement des observations et du changement de mode pour que les lignes soient validées avec le bon mode de copie 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 6a3a870fba7597edec56a7f2c16c15cb6ac06f0d Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 18:02:32 2016 +0200 inversion du chargement des observations et du changement de mode pour que les lignes soient validées avec le bon mode de copie Summary of changes: .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 6a3a870fba7597edec56a7f2c16c15cb6ac06f0d Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 18:02:32 2016 +0200 inversion du chargement des observations et du changement de mode pour que les lignes soient validées avec le bon mode de copie --- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 c89c608..4b07cbc 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 @@ -1242,12 +1242,13 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setRows(frequencyRows); - individualObservationBatchTableHandler.loadSpeciesBatch(speciesBatch, individualObservationRows, addToCache); - // let's change the copy mode (mark it in init mode to avoid user change confirmation and some recomputations) model.setCopyIndividualObservationMode(null); model.setCopyIndividualObservationMode(copyIndividualObservationMode); + // chargement des observations après le changement de mode de copie, pour que la validation des lignes prenne en compte le nouveau mode de copie + individualObservationBatchTableHandler.loadSpeciesBatch(speciesBatch, individualObservationRows, addToCache); + model.computeRowWeightWithRtp(); } finally { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm