Author: tchemit Date: 2012-09-14 16:36:44 +0200 (Fri, 14 Sep 2012) New Revision: 660 Url: http://forge.codelutin.com/repositories/revision/echobase/660 Log: improve pager code 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-09-14 10:18:34 UTC (rev 659) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-09-14 14:36:44 UTC (rev 660) @@ -142,6 +142,11 @@ TopiaPagerBeanBuilder builder = new TopiaPagerBeanBuilder(pager); + if (useSort()) { + builder.setSortAscendant(isSortAscendant()) + .setSortcolumn(getSortColumn()); + } + if (StringUtils.isNotEmpty(filters)) { Map<String, Object> filterObject = (Map<String, Object>) JSONUtil.deserialize(filters); @@ -161,13 +166,9 @@ if (StringUtils.isNotEmpty(searchField)) { pager = builder. setFilterOperationGroup("AND"). - setSortAscendant(isSortAscendant()). - setSortcolumn(getSortColumn()). addRule(searchOper, searchField, searchString). toBean(); } } - - } }