=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrderParams.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrderParams.java 2016-01-05 07:53:54 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrderParams.java 2016-01-05 08:11:51 +0000 @@ -76,18 +76,18 @@ continue; } - Order newOrder; + Order order; - if ( "asc".equals( split[1] ) ) + if ( "asc".equals( split[1] ) || "iasc".equals( split[1] ) ) { - newOrder = Order.iasc( schema.getProperty( split[0] ) ); + order = Order.iasc( schema.getProperty( split[0] ) ); } else { - newOrder = Order.idesc( schema.getProperty( split[0] ) ); + order = Order.idesc( schema.getProperty( split[0] ) ); } - orders.put( split[0], newOrder.ignoreCase() ); + orders.put( split[0], order.ignoreCase() ); } return new ArrayList<>( orders.values() ); @@ -100,7 +100,8 @@ private boolean validDirection( String direction ) { - return "asc".equals( direction ) || "desc".equals( direction ); + return "asc".equals( direction ) || "desc".equals( direction ) + || "iasc".equals( direction ) || "idesc".equals( direction ); } @Override