------------------------------------------------------------
revno: 20451
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Thu 2015-10-01 18:00:29 +0200
message:
OrganisationUnit.mergeWith, fix for parent
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.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/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2015-09-23 18:55:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2015-10-01 16:00:29 +0000
@@ -1208,7 +1208,7 @@
address = organisationUnit.getAddress() == null ? address : organisationUnit.getAddress();
email = organisationUnit.getEmail() == null ? email : organisationUnit.getEmail();
phoneNumber = organisationUnit.getPhoneNumber() == null ? phoneNumber : organisationUnit.getPhoneNumber();
- parent = organisationUnit.getParent();
+ parent = organisationUnit.getParent() == null ? parent : organisationUnit.getParent();
}
groups.clear();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
