=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataSetController.java 2012-10-08 19:54:30 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataSetController.java 2012-10-09 09:02:19 +0000 @@ -72,8 +72,8 @@ // ------------------------------------------------------------------------- @RequestMapping( value = "/{uid}/form", method = RequestMethod.GET, produces = "application/json" ) - public void getFormJson( @PathVariable( "uid" ) String uid, @RequestParam( value = "orgUnit", required = false ) String orgUnit, - @RequestParam( value = "period", required = false ) String period, HttpServletResponse response ) throws IOException + public void getFormJson( @PathVariable( "uid" ) String uid, @RequestParam( value = "ou", required = false ) String orgUnit, + @RequestParam( value = "pe", required = false ) String period, HttpServletResponse response ) throws IOException { DataSet dataSet = getEntity( uid ); @@ -99,8 +99,8 @@ } @RequestMapping( value = "/{uid}/form", method = RequestMethod.GET, produces = {"application/xml", "text/xml"} ) - public void getFormXml( @PathVariable( "uid" ) String uid, @RequestParam( value = "orgUnit", required = false ) String orgUnit, - @RequestParam( value = "period", required = false ) String period, HttpServletResponse response ) throws IOException + public void getFormXml( @PathVariable( "uid" ) String uid, @RequestParam( value = "ou", required = false ) String orgUnit, + @RequestParam( value = "pe", required = false ) String period, HttpServletResponse response ) throws IOException { DataSet dataSet = getEntity( uid );