Author: tchemit Date: 2012-10-05 18:19:11 +0200 (Fri, 05 Oct 2012) New Revision: 720 Url: http://forge.codelutin.com/repositories/revision/echobase/720 Log: fixes #1571: Le filtre sur les campagnes dans l'?\195?\169cran de suppression ne fonctionne pas Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-10-05 15:43:15 UTC (rev 719) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-10-05 16:19:11 UTC (rev 720) @@ -39,6 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.pager.FilterRule; +import org.nuiton.topia.persistence.pager.FilterRuleGroupOperator; import org.nuiton.topia.persistence.pager.FilterRuleOperator; import org.nuiton.util.decorator.Decorator; @@ -118,6 +119,7 @@ pager.setRules(Arrays.asList(new FilterRule( FilterRuleOperator.eq, ImportLog.PROPERTY_VOYAGE_ID, voyageId ))); + pager.setGroupOp(FilterRuleGroupOperator.AND); } execute(); Map<String, String> importTypes = decorateEnums(ImportType.values());