dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18589
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-03-12 10:34:38 +0100
message:
  User edit fix
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.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-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java	2015-03-11 11:01:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java	2015-03-12 09:34:38 +0000
@@ -252,7 +252,7 @@
 
         UserCredentials userCredentials = userService.getUserCredentials( user );
 
-        if ( !StringUtils.isEmpty( openId ) )
+        if ( StringUtils.isNotEmpty( openId ) )
         {
             userCredentials.setOpenId( StringUtils.trimToNull( openId ) );
         }
@@ -330,7 +330,7 @@
         // Update User
         // ---------------------------------------------------------------------
 
-        if ( rawPassword != null )
+        if ( StringUtils.isNotEmpty( rawPassword ) )
         {
             userService.encodeAndSetPassword( userCredentials, rawPassword );
         }