branch develop-3.x updated (8928e4d -> 0b3be13)
This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 8928e4d [jgitflow-maven-plugin]Updating develop poms back to pre merge state new d7e5c61 utilisation de la même unité que celle du modèle (refs #7039) new 0b3be13 fixes #7039: [CAPTURE] Lespoids de captures sont tous en Kg Merge branch 'feature/7039' into develop-3.x The 2 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 0b3be13bf213faa0f4bbf9f4124f3fdbdf5826f4 Merge: 8928e4d d7e5c61 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 21:52:27 2015 +0200 fixes #7039: [CAPTURE] Lespoids de captures sont tous en Kg Merge branch 'feature/7039' into develop-3.x commit d7e5c61aacea4b1317218db79498d848f02964dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 21:52:23 2015 +0200 utilisation de la même unité que celle du modèle (refs #7039) Summary of changes: .../tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit d7e5c61aacea4b1317218db79498d848f02964dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 21:52:23 2015 +0200 utilisation de la même unité que celle du modèle (refs #7039) --- .../tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index c99e5c4..cef11c3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -153,7 +153,7 @@ public class EditCatchesSvgHandler { if (log.isDebugEnabled()) { log.debug("gvtRenderingCompleted"); } - WeightUnit catchWeightUnit = WeightUnit.KG; + WeightUnit catchWeightUnit = model.getCatchWeightUnit(); WeightUnit speciesWeightUnit = config.getSpeciesWeightUnit(); WeightUnit benthosWeightUnit = config.getBenthosWeightUnit(); WeightUnit marineLitterWeightUnit = config.getMarineLitterWeightUnit(); -- 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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 0b3be13bf213faa0f4bbf9f4124f3fdbdf5826f4 Merge: 8928e4d d7e5c61 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 30 21:52:27 2015 +0200 fixes #7039: [CAPTURE] Lespoids de captures sont tous en Kg Merge branch 'feature/7039' into develop-3.x .../tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm