branch develop updated (f5e93c7 -> 77b9ec7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f5e93c7 fixes #6073: [TECHNIQUE] Mise à jour java 1.7u72 fixes #6074: [TECHNIQUE] Mise à jour de certaines urls dans le site new 3b5c7d5 fixes #6076: [REFERENTIEL] L'action d'export de l'existant non grisée même si plus de personnes temporaires new 83f119b fixes #6075: [CAPTURE] Impossible de supprimer le poids total de la capture new 77b9ec7 fixes #6077: [TECHNIQUE] Mise à jour de librairies The 3 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 77b9ec72644770debbc1c4b43f5a299993a4a513 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 19:00:07 2014 +0100 fixes #6077: [TECHNIQUE] Mise à jour de librairies commit 83f119b42d6faae4f3f8a80b8cca9f7418562adb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 18:58:44 2014 +0100 fixes #6075: [CAPTURE] Impossible de supprimer le poids total de la capture commit 3b5c7d5b83379209158551af50f5a0fb821517f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 18:58:30 2014 +0100 fixes #6076: [REFERENTIEL] L'action d'export de l'existant non grisée même si plus de personnes temporaires Summary of changes: pom.xml | 14 +++++++------- .../service/CatchBatchPersistenceServiceImpl.java | 10 +++++++++- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +++--- .../content/referential/ManageTemporaryReferentialUI.css | 2 +- 4 files changed, 20 insertions(+), 12 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 http://git.codelutin.com/tutti.git commit 3b5c7d5b83379209158551af50f5a0fb821517f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 18:58:30 2014 +0100 fixes #6076: [REFERENTIEL] L'action d'export de l'existant non grisée même si plus de personnes temporaires --- .../tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css index 0cb5de9..4e3bdac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css @@ -52,7 +52,7 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporarySpeciesAction.class}; - visible: { model.getNbTemporarySpecies() > 0 }; + enabled: { model.getNbTemporarySpecies() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.help"}; } -- 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 http://git.codelutin.com/tutti.git commit 83f119b42d6faae4f3f8a80b8cca9f7418562adb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 18:58:44 2014 +0100 fixes #6075: [CAPTURE] Impossible de supprimer le poids total de la capture --- .../persistence/service/CatchBatchPersistenceServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java index 670de9d..2bf6a84 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java @@ -368,7 +368,15 @@ public class CatchBatchPersistenceServiceImpl synchronizationStatusHelper.setDirty(target); // Total Weight - if (source.getCatchTotalWeight() != null) { + if (source.getCatchTotalWeight() == null) { + + QuantificationMeasurement quantificationMeasurement = measurementPersistenceHelper.getWeightMeasurementQuantificationMeasurement(target); + if (quantificationMeasurement!=null) { + + // remove it + measurementPersistenceHelper.removeWeightMeasurementQuantificationMeasurement(target, quantificationMeasurement); + } + } else { measurementPersistenceHelper.setWeightMeasurementQuantificationMeasurement( target, -- 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 http://git.codelutin.com/tutti.git commit 77b9ec72644770debbc1c4b43f5a299993a4a513 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 19:00:07 2014 +0100 fixes #6077: [TECHNIQUE] Mise à jour de librairies --- pom.xml | 14 +++++++------- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7d117d2..df542dd 100644 --- a/pom.xml +++ b/pom.xml @@ -137,9 +137,9 @@ <slf4jVersion>1.7.7</slf4jVersion> <adagioVersion>3.6.4</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> - <hibernateVersion>4.3.6.Final</hibernateVersion> - <springVersion>4.1.0.RELEASE</springVersion> - <hsqldbVersion>1.8.0.10</hsqldbVersion> + <hibernateVersion>4.3.7.Final</hibernateVersion> + <springVersion>4.1.1.RELEASE</springVersion> + <hsqldbVersion>1.8.1.3</hsqldbVersion> <!-- I18n configuration --> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -465,20 +465,20 @@ <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.6</version> + <version>9.0.7</version> </dependency> <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> - <version>5.5.2</version> + <version>5.5.3</version> </dependency> <!-- FreeMarker --> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.20</version> + <version>2.3.21</version> </dependency> <!-- Bluecove --> @@ -505,7 +505,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>1.10.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/tutti-ui-swing/src/license/THIRD-PARTY.properties b/tutti-ui-swing/src/license/THIRD-PARTY.properties index 9275441..a5f4186 100644 --- a/tutti-ui-swing/src/license/THIRD-PARTY.properties +++ b/tutti-ui-swing/src/license/THIRD-PARTY.properties @@ -8,7 +8,6 @@ # - Apache License Version 2.0 # - Apache License, version 2.0 # - BSD License -# - BSD-style license # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 @@ -19,10 +18,10 @@ # - GNU General Public License (GPL) # - GNU General Public License - Version 2 with the class path exception # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) -# - HSQLDB License # - ICU License # - Java HTML Tidy License # - LGPL 2.1 @@ -39,7 +38,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jul 22 08:47:10 CEST 2014 +#Sat Nov 08 18:30:54 CET 2014 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 @@ -56,3 +55,4 @@ batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +hsqldb--hsqldb--1.8.1.3=BSD License -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm