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 1189c34477f082ad7d8ec9525b92907baa7b3979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 18:23:03 2016 +0200 Utilisation de l'unité adaptée --- .../operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 2 +- .../operation/catches/species/frequency/SpeciesFrequencyUIModel.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss index b8b3021..5764b9d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss @@ -448,7 +448,7 @@ ComputableDataEditor { labelFor: {totalWeightField}; enabled: {model.getTotalWeight() != null}; _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; - _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; + _addWeightUnit: {model.getWeightUnit()}; } #totalWeightField { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index da6a793..f0f9d67 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -379,6 +379,10 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa setIndividualObservationRowsInError(new HashSet<>()); } + public WeightUnit getWeightUnit() { + return weightUnit; + } + public boolean isInitBatchEdition() { return initBatchEdition; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.