------------------------------------------------------------
revno: 13530
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Thu 2014-01-02 11:30:46 +0100
message:
minor fix in add/edit orgUnit
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.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-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2013-11-28 14:18:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2014-01-02 10:30:46 +0000
@@ -335,7 +335,6 @@
if ( group != null )
{
group.addOrganisationUnit( organisationUnit );
- // organisationUnitGroupService.updateOrganisationUnitGroup( group );
manager.updateNoAcl( group );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2013-11-28 14:18:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2014-01-02 10:30:46 +0000
@@ -361,14 +361,12 @@
if ( oldGroup != null && oldGroup.getMembers().remove( organisationUnit ) )
{
oldGroup.removeOrganisationUnit( organisationUnit );
- // organisationUnitGroupService.updateOrganisationUnitGroup( oldGroup );
manager.updateNoAcl( oldGroup );
}
if ( newGroup != null && newGroup.getMembers().add( organisationUnit ) )
{
newGroup.addOrganisationUnit( organisationUnit );
- // organisationUnitGroupService.updateOrganisationUnitGroup( newGroup );
manager.updateNoAcl( newGroup );
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
