=== 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 2014-11-11 04:10:15 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2014-11-17 14:35:17 +0000 @@ -486,7 +486,10 @@ } response.setStatus( HttpServletResponse.SC_NO_CONTENT ); + + preDeleteEntity( objects.get( 0 ) ); manager.delete( objects.get( 0 ) ); + postDeleteEntity(); } //-------------------------------------------------------------------------- @@ -715,6 +718,14 @@ { } + protected void preDeleteEntity( T entity ) + { + } + + protected void postDeleteEntity() + { + } + //-------------------------------------------------------------------------- // Helpers //-------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-10-21 09:19:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-11-17 14:35:17 +0000 @@ -38,6 +38,7 @@ import org.hisp.dhis.schema.descriptors.OrganisationUnitSchemaDescriptor; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; +import org.hisp.dhis.version.VersionService; import org.hisp.dhis.webapi.controller.AbstractCrudController; import org.hisp.dhis.webapi.webdomain.WebMetaData; import org.hisp.dhis.webapi.webdomain.WebOptions; @@ -69,6 +70,9 @@ private OrganisationUnitService organisationUnitService; @Autowired + private VersionService versionService; + + @Autowired private CurrentUserService currentUserService; @Override @@ -313,4 +317,22 @@ generator.writeEndObject(); } + + @Override + protected void postCreateEntity( OrganisationUnit entity ) + { + versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION ); + } + + @Override + protected void postUpdateEntity( OrganisationUnit entity ) + { + versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION ); + } + + @Override + protected void postDeleteEntity() + { + versionService.updateVersion( VersionService.ORGANISATIONUNIT_VERSION ); + } } === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-12 09:21:19 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-11-17 14:35:17 +0000 @@ -134,7 +134,7 @@ } return dhis2.de.currentOrganisationUnitId; -} +}; DAO.store = new dhis2.storage.Store( { name: 'dhis2',