dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15951
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-07-03 13:09:34 +0700
message:
  minor merge fix for user, merges firstName and surname
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-06-30 17:11:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2014-07-03 06:09:34 +0000
@@ -531,6 +531,9 @@
         {
             User user = (User) other;
 
+            firstName = user.getFirstName();
+            surname = user.getSurname();
+
             email = user.getEmail();
             phoneNumber = user.getPhoneNumber();
             jobTitle = user.getJobTitle();