Author: tchemit Date: 2012-10-17 17:16:03 +0200 (Wed, 17 Oct 2012) New Revision: 731 Url: http://forge.codelutin.com/repositories/revision/echobase/731 Log: fixes #1602: Impossible de faire une recherche sur Operation.id Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-10-17 12:11:49 UTC (rev 730) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-10-17 15:16:03 UTC (rev 731) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.ui.actions; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; @@ -155,6 +156,14 @@ Collection<Map<String, String>> rules = (Collection<Map<String, String>>) filterObject.get("rules"); + if (CollectionUtils.isNotEmpty(rules)) { + for (Map<String, String> rule : rules) { + //TODO tchemit-2012-10-17 Fix this bug + if ("ID".equals(rule.get("field"))) { + rule.put("field", "id"); + } + } + } pager = builder. setFilterOperationGroup(groupOp). addRules(rules).