Author: echatellier Date: 2013-06-27 11:37:45 +0200 (Thu, 27 Jun 2013) New Revision: 252 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/252 Log: fixes #2795: Fix security check for TEMOIN test bio Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-24 07:46:22 UTC (rev 251) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-27 09:37:45 UTC (rev 252) @@ -37,6 +37,7 @@ import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.data.model.Purification; import nc.ird.cantharella.data.model.ResultatTestBio; +import nc.ird.cantharella.data.model.ResultatTestBio.TypeResultat; import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; @@ -307,7 +308,8 @@ while (itResultatTestBios.hasNext()) { ResultatTestBio resultatTestBio = itResultatTestBios.next(); Lot lot = resultatTestBio.getLotSource(); - if (!lotService.isLotAccessibleByUser(lot, utilisateur)) { + // le lot peut être null pour les tests temoin + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT || !lotService.isLotAccessibleByUser(lot, utilisateur)) { itResultatTestBios.remove(); } } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-24 07:46:22 UTC (rev 251) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-27 09:37:45 UTC (rev 252) @@ -178,14 +178,6 @@ add(purificationsDataTable); // test bio table - // fix, resultat test bio page must only display produit type (excluding Temoin, Blanc...) - Iterator<ResultatTestBio> itResultatTestBios = searchResult.getResultatTestBios().iterator(); - while (itResultatTestBios.hasNext()) { - ResultatTestBio resultatTestBio = itResultatTestBios.next(); - if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT) { - itResultatTestBios.remove(); - } - } DataTable<ResultatTestBio, String> testBiosDataTable = ListTestsBioPage.initTestsBioDataTable(this, "SearchPage.ResultatTestBios.Results", currentPage, searchResult.getResultatTestBios(), testBioService); add(testBiosDataTable);