dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17947
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-01-12 18:16:12 +0100
message:
  Added missing field to user mergeWith
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.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-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2014-12-29 11:34:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2015-01-12 17:16:12 +0000
@@ -638,6 +638,9 @@
 
             organisationUnits.clear();
             organisationUnits.addAll( user.getOrganisationUnits() );
+            
+            dataViewOrganisationUnits.clear();
+            dataViewOrganisationUnits.addAll( user.getDataViewOrganisationUnits() );
         }
     }