[tutti] branch develop updated (c143319 -> 55dafb4)
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 c143319 refs #5747 add key actions for operation caracteristics new 3e8331f fixes #5853 [RAPPORT PDF] Erreur quand on a une espece qui n'est pas dans le protocole new 55dafb4 Merge branch 'develop' of https://git.codelutin.com/tutti into develop 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 55dafb4f6a9d6f4fef146812ea5d3e8acb36eef2 Merge: 3e8331f c143319 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 25 11:08:33 2014 +0200 Merge branch 'develop' of https://git.codelutin.com/tutti into develop commit 3e8331f635037ed8ece10f7e4fa0af9c3e21aff4 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 25 11:07:46 2014 +0200 fixes #5853 [RAPPORT PDF] Erreur quand on a une espece qui n'est pas dans le protocole Summary of changes: .../fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java | 4 +++- 1 file changed, 3 insertions(+), 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 in repository tutti. See http://git.codelutin.com/tutti.git commit 3e8331f635037ed8ece10f7e4fa0af9c3e21aff4 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 25 11:07:46 2014 +0200 fixes #5853 [RAPPORT PDF] Erreur quand on a une espece qui n'est pas dans le protocole --- .../fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java index 77f22b3..cdd88d9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java @@ -197,7 +197,9 @@ public class CatchesPdfExportService extends AbstractTuttiService { String code; - if (protocolFilled) { + + // if the protocol is set and the species is in the protocol + if (protocolFilled && speciesProtocolMap.containsKey(species.getReferenceTaxonId())) { // use surveyCode from protocol SpeciesProtocol speciesProtocol = speciesProtocolMap.get(species.getReferenceTaxonId()); -- 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 55dafb4f6a9d6f4fef146812ea5d3e8acb36eef2 Merge: 3e8331f c143319 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 25 11:08:33 2014 +0200 Merge branch 'develop' of https://git.codelutin.com/tutti into develop .../content/operation/fishing/GearUseFeatureTabUIHandler.java | 7 +++++++ .../content/operation/fishing/VesselUseFeatureTabUIHandler.java | 6 ++++++ 2 files changed, 13 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm