------------------------------------------------------------ revno: 17224 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Thu 2014-10-23 15:07:12 +0700 message: set proper content-type for enrollment POST/PUT modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2014-10-23 07:58:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2014-10-23 08:07:12 +0000 @@ -176,11 +176,12 @@ // CREATE // ------------------------------------------------------------------------- - @RequestMapping( value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_XML_VALUE ) + @RequestMapping( value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_XML_VALUE, produces = MediaType.APPLICATION_XML_VALUE ) @PreAuthorize( "hasRole('ALL') or hasRole('F_PROGRAM_ENROLLMENT')" ) public void postEnrollmentXml( HttpServletRequest request, HttpServletResponse response ) throws IOException { ImportSummaries importSummaries = enrollmentService.addEnrollmentsXml( request.getInputStream() ); + response.setContentType( MediaType.APPLICATION_XML_VALUE ); if ( importSummaries.getImportSummaries().size() > 1 ) { @@ -201,11 +202,12 @@ } } - @RequestMapping( value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE ) + @RequestMapping( value = "", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE ) @PreAuthorize( "hasRole('ALL') or hasRole('F_PROGRAM_ENROLLMENT')" ) public void postEnrollmentJson( HttpServletRequest request, HttpServletResponse response ) throws IOException { ImportSummaries importSummaries = enrollmentService.addEnrollmentsJson( request.getInputStream() ); + response.setContentType( MediaType.APPLICATION_JSON_VALUE ); if ( importSummaries.getImportSummaries().size() > 1 ) { @@ -230,19 +232,23 @@ // UPDATE // ------------------------------------------------------------------------- - @RequestMapping( value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_XML_VALUE ) + @RequestMapping( value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_XML_VALUE, produces = MediaType.APPLICATION_XML_VALUE ) @PreAuthorize( "hasRole('ALL') or hasRole('F_PROGRAM_UNENROLLMENT')" ) public void updateEnrollmentXml( @PathVariable String id, HttpServletRequest request, HttpServletResponse response ) throws IOException { ImportSummary importSummary = enrollmentService.updateEnrollmentXml( id, request.getInputStream() ); + response.setContentType( MediaType.APPLICATION_XML_VALUE ); + JacksonUtils.toXml( response.getOutputStream(), importSummary ); } - @RequestMapping( value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE ) + @RequestMapping( value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE ) @PreAuthorize( "hasRole('ALL') or hasRole('F_PROGRAM_UNENROLLMENT')" ) public void updateEnrollmentJson( @PathVariable String id, HttpServletRequest request, HttpServletResponse response ) throws IOException { ImportSummary importSummary = enrollmentService.updateEnrollmentJson( id, request.getInputStream() ); + response.setContentType( MediaType.APPLICATION_JSON_VALUE ); + JacksonUtils.toJson( response.getOutputStream(), importSummary ); } @@ -253,6 +259,7 @@ { Enrollment enrollment = getEnrollment( id ); enrollment.setStatus( EnrollmentStatus.CANCELLED ); + enrollmentService.cancelEnrollment( enrollment ); } @@ -263,6 +270,7 @@ { Enrollment enrollment = getEnrollment( id ); enrollment.setStatus( EnrollmentStatus.COMPLETED ); + enrollmentService.completeEnrollment( enrollment ); }
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp