dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17821
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-12-29 12:34:35 +0100
message:
  Updated UserCredentials.merge
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.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-25 14:21:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java	2014-12-29 11:34:35 +0000
@@ -616,9 +616,8 @@
         {
             User user = (User) other;
 
+            surname = user.getSurname();
             firstName = user.getFirstName();
-            surname = user.getSurname();
-
             email = user.getEmail();
             phoneNumber = user.getPhoneNumber();
             jobTitle = user.getJobTitle();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2014-12-26 13:22:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2014-12-29 11:34:35 +0000
@@ -623,19 +623,25 @@
         {
             UserCredentials userCredentials = (UserCredentials) other;
 
+            username = userCredentials.getUsername();
             openId = userCredentials.getOpenId();
-            disabled = userCredentials.isDisabled();
-            selfRegistered = userCredentials.isSelfRegistered();
             password = StringUtils.isEmpty( userCredentials.getPassword() ) ? password : userCredentials.getPassword();
-
+            passwordLastUpdated = userCredentials.getPasswordLastUpdated();
+            
+            userAuthorityGroups.clear();
+            userAuthorityGroups.addAll( userCredentials.getUserAuthorityGroups() );
+            
             catDimensionConstraints.clear();
             catDimensionConstraints.addAll( userCredentials.getCatDimensionConstraints() );
 
             cogsDimensionConstraints.clear();
             cogsDimensionConstraints.addAll( userCredentials.getCogsDimensionConstraints() );
 
-            userAuthorityGroups.clear();
-            userAuthorityGroups.addAll( userCredentials.getUserAuthorityGroups() );
+            lastLogin = userCredentials.getLastLogin();
+            restoreToken = userCredentials.getRestoreToken();
+            restoreExpiry = userCredentials.getRestoreExpiry();
+            selfRegistered = userCredentials.isSelfRegistered();
+            disabled = userCredentials.isDisabled();
         }
     }