Author: tchemit Date: 2012-02-16 23:52:30 +0100 (Thu, 16 Feb 2012) New Revision: 315 Url: http://forge.codelutin.com/repositories/revision/echobase/315 Log: use nuiton-struts FilterPagerBean Modified: trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-02-15 14:13:57 UTC (rev 314) +++ trunk/echobase-services/pom.xml 2012-02-16 22:52:30 UTC (rev 315) @@ -48,6 +48,11 @@ <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> + <!-- comons dependencies --> <dependency> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-02-15 14:13:57 UTC (rev 314) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-02-16 22:52:30 UTC (rev 315) @@ -51,6 +51,7 @@ import org.nuiton.util.csv.ImportExportModel; import org.nuiton.util.csv.ImportableColumn; import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.web.struts2.FilterPagerUtil; import java.util.Collection; import java.util.List; @@ -91,7 +92,7 @@ //TODO Use an object to filter datas public Map<?, ?>[] getDatas(EchoBaseEntityEnum entityType, - FilterPagerBean pager, + FilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder) { @@ -118,7 +119,7 @@ } public <E extends TopiaEntity> List<E> getEntities(TableMeta tableMeta, - FilterPagerBean pager, + FilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder, String extraWhereQuery) { @@ -140,11 +141,11 @@ DecoratorService decoratorService = getDecoratorService(); // prepare the filter hql code - List<FilterPagerBean.FilterRule> rules = pager.getRules(); + List<FilterPagerUtil.FilterRule> rules = pager.getRules(); List<String> strFilterRules = Lists.newLinkedList(); long timestamp = System.currentTimeMillis(); int index = 0; - for (FilterPagerBean.FilterRule rule : rules) { + for (FilterPagerUtil.FilterRule rule : rules) { String ruleFilter; String field = rule.getField(); @@ -153,7 +154,7 @@ Preconditions.checkNotNull( columnMeta, "no property named " + columnMeta); - FilterPagerBean.Operation op = rule.getOp(); + FilterPagerUtil.FilterOperation op = rule.getOp(); String data = rule.getData(); String paramName = field + "_" + timestamp + (index++); String propertyName = "e." + field; @@ -210,7 +211,7 @@ } if (CollectionUtils.isNotEmpty(strFilterRules)) { - FilterPagerBean.OperationGroup groupOp = pager.getGroupOp(); + FilterPagerUtil.FilterOperationGroup groupOp = pager.getGroupOp(); filterHql = StringUtils.join(strFilterRules, groupOp.name()); } } 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-02-15 14:13:57 UTC (rev 314) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-02-16 22:52:30 UTC (rev 315) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.ui.actions; -import fr.ifremer.echobase.services.FilterPagerBean; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; +import org.nuiton.web.struts2.FilterPagerUtil; import java.util.Collection; import java.util.Map; @@ -49,7 +49,7 @@ public abstract Integer getRecords(); - protected FilterPagerBean pager = new FilterPagerBean(); + protected FilterPagerUtil.FilterPagerBean pager = new FilterPagerUtil.FilterPagerBean(); // sorting order - asc or desc protected String sord; @@ -121,7 +121,7 @@ Collection<Map<String, String>> rules = (Collection<Map<String, String>>) filterObject.get("rules"); - FilterPagerBean.newFilterPagerBeanBuilder(groupOp). + FilterPagerUtil.newFilterPagerBeanBuilder(groupOp). addOperations(rules). flush(pager); } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-02-15 14:13:57 UTC (rev 314) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-02-16 22:52:30 UTC (rev 315) @@ -97,6 +97,7 @@ // push the id of row $("#" + propertyName).val(value); + $("#entityId").val(value); return; } @@ -312,6 +313,8 @@ <s:hidden id="topiaId" name='topiaId' label=''/> + <s:textfield id="entityId" name='topiaId' label='' readonly="true" size="200"/> + <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK">