This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 88bd4dbf97146a721a2296b4681a30832543f94d Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 11:35:06 2015 +0100 Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres --- .../fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index 1c3cb1b..cd3fd41 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -88,11 +88,11 @@ public class SampleRowsFilterValues extends AbstractFilterValues { boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); boolean sampleRowMatchesOrganisation = true; if (optionalCompanyId.isPresent()) { - String sampleRowOrganisationId = null; + String sampleRowCompanyId = null; if (sampleRow.getOrganisation() != null) { - sampleRowOrganisationId = sampleRow.getOrganisation().getTopiaId(); + sampleRowCompanyId = sampleRow.getOrganisation().getCompany().getTopiaId(); } - sampleRowMatchesOrganisation = optionalCompanyId.get().equals(sampleRowOrganisationId); + sampleRowMatchesOrganisation = optionalCompanyId.get().equals(sampleRowCompanyId); } // par exemple, dans le cas du filtre navire, la présente méthode est appelée pour toutes les -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.