=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-02-12 04:35:40 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-03-02 05:27:16 +0000 @@ -491,12 +491,13 @@ if ( ImportStatus.SUCCESS.equals( importTypeSummary.getStatus() ) ) { - postCreateEntity( parsed ); - if ( importTypeSummary.getImportCount().getImported() == 1 && importTypeSummary.getLastImported() != null ) { response.setHeader( "Location", contextService.getApiPath() + getSchema().getRelativeApiEndpoint() + "/" + importTypeSummary.getLastImported() ); + + T entity = manager.get( importTypeSummary.getLastImported() ); + postCreateEntity( entity ); } } @@ -521,12 +522,13 @@ if ( ImportStatus.SUCCESS.equals( importTypeSummary.getStatus() ) ) { - postCreateEntity( parsed ); - if ( importTypeSummary.getImportCount().getImported() == 1 && importTypeSummary.getLastImported() != null ) { response.setHeader( "Location", contextService.getApiPath() + getSchema().getRelativeApiEndpoint() + "/" + importTypeSummary.getLastImported() ); + + T entity = manager.get( importTypeSummary.getLastImported() ); + postCreateEntity( entity ); } } @@ -562,7 +564,8 @@ if ( ImportStatus.SUCCESS.equals( importTypeSummary.getStatus() ) ) { - postUpdateEntity( parsed ); + T entity = manager.get( pvUid ); + postUpdateEntity( entity ); } webMessageService.send( WebMessageUtils.importTypeSummary( importTypeSummary ), response, request ); @@ -593,7 +596,8 @@ if ( ImportStatus.SUCCESS.equals( importTypeSummary.getStatus() ) ) { - postUpdateEntity( parsed ); + T entity = manager.get( pvUid ); + postUpdateEntity( entity ); } webMessageService.send( WebMessageUtils.importTypeSummary( importTypeSummary ), response, request );