=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2012-05-28 14:25:12 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2012-06-20 18:52:17 +0000 @@ -112,6 +112,8 @@ log.info( AuditLogUtil.logMessage( currentUserService.getCurrentUsername(), AuditLogUtil.ACTION_EDIT, OrganisationUnit.class.getSimpleName(), organisationUnit.getName() ) ); + + updateVersion(); } public void updateOrganisationUnit( OrganisationUnit organisationUnit, boolean updateHierarchy ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2012-06-01 13:05:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2012-06-20 18:52:17 +0000 @@ -20,10 +20,7 @@ /main.vm /dhis-web-maintenance-organisationunit/organisationUnit.vm /dhis-web-maintenance-organisationunit/menuWithTree.vm - - ../dhis-web-commons/ouwt/ouwt.js, - javascript/organisationUnit.js - + ../dhis-web-commons/ouwt/ouwt.js, javascript/organisationUnit.js @@ -36,19 +33,17 @@ /main.vm /dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm - javascript/shortName.js,../dhis-web-commons/ouwt/ouwt.js + javascript/shortName.js F_ORGANISATIONUNIT_ADD - organisationUnit.action - + organisationUnit.action F_ORGANISATIONUNIT_ADD - organisationUnit.action - + organisationUnit.action /main.vm /dhis-web-maintenance-organisationunit/assignToCompulsoryGroupSetForm.vm @@ -60,7 +55,7 @@ /main.vm /dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm - javascript/shortName.js,../dhis-web-commons/ouwt/ouwt.js + javascript/shortName.js F_ORGANISATIONUNIT_UPDATE @@ -70,12 +65,8 @@ - - /dhis-web-commons/ajax/jsonResponseSuccess.vm - - - /dhis-web-commons/ajax/jsonResponseError.vm - + /dhis-web-commons/ajax/jsonResponseSuccess.vm + /dhis-web-commons/ajax/jsonResponseError.vm plainTextError F_ORGANISATIONUNIT_DELETE @@ -101,17 +92,13 @@ - - /dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm - + /dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm plainTextError - ../dhis-web-commons/ajax/jsonResponseSuccess.vm - - ../dhis-web-commons/ajax/jsonResponseError.vm - + ../dhis-web-commons/ajax/jsonResponseSuccess.vm + ../dhis-web-commons/ajax/jsonResponseError.vm plainTextError @@ -159,25 +146,18 @@ - - /dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm - + /dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm plainTextError - organisationUnitGroupSet.action - + organisationUnitGroupSet.action F_ORGUNITGROUPSET_ADD - - /dhis-web-commons/ajax/jsonResponseSuccess.vm - - - /dhis-web-commons/ajax/jsonResponseError.vm - + /dhis-web-commons/ajax/jsonResponseSuccess.vm + /dhis-web-commons/ajax/jsonResponseError.vm plainTextError @@ -196,12 +176,8 @@ - - /dhis-web-commons/ajax/jsonResponseSuccess.vm - - - /dhis-web-commons/ajax/jsonResponseError.vm - + /dhis-web-commons/ajax/jsonResponseSuccess.vm + /dhis-web-commons/ajax/jsonResponseError.vm plainTextError F_ORGUNITGROUPSET_DELETE