Author: tchemit Date: 2014-04-09 16:04:13 +0200 (Wed, 09 Apr 2014) New Revision: 1874 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1874 Log: refs #4487 make sure to hav only sample rows within the connected user obsProgram Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-09 12:58:06 UTC (rev 1873) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-09 14:04:13 UTC (rev 1874) @@ -178,7 +178,8 @@ @Override public boolean isFilled() { // volontairement, on ne considère pas ObsProgram car ce n'est pas un critère de sélection en lui-même - boolean filled = periodFrom != null + boolean filled = obsProgram != null + || periodFrom != null || periodTo != null || CollectionUtils.isNotEmpty(sampleRowIds) || CollectionUtils.isNotEmpty(fishingZoneFacadeNames)