=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java 2012-12-18 17:24:57 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java 2013-07-10 09:50:45 +0000 @@ -76,6 +76,13 @@ boolean levelSorted = options.getOptions().containsKey( "levelSorted" ) && Boolean.parseBoolean( options.getOptions().get( "levelSorted" ) ); + Integer level = null; + + if ( options.getOptions().containsKey( "level" ) ) + { + level = Integer.parseInt( options.getOptions().get( "level" ) ); + } + if ( lastUpdated != null ) { entityList = new ArrayList( manager.getByLastUpdatedSorted( getEntityClass(), lastUpdated ) ); @@ -85,6 +92,10 @@ Collections.sort( entityList, OrganisationUnitByLevelComparator.INSTANCE ); } } + else if ( level != null ) + { + entityList = new ArrayList( organisationUnitService.getOrganisationUnitsAtLevel( level ) ); + } else if ( levelSorted ) { entityList = new ArrayList( manager.getAll( getEntityClass() ) ); @@ -108,8 +119,8 @@ } @Override - @RequestMapping(value = "/{uid}", method = RequestMethod.GET) - public String getObject( @PathVariable("uid") String uid, @RequestParam Map parameters, + @RequestMapping( value = "/{uid}", method = RequestMethod.GET ) + public String getObject( @PathVariable( "uid" ) String uid, @RequestParam Map parameters, Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception { WebOptions options = new WebOptions( parameters );