dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 110
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-24 15:33:11 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateUserAction.java

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateUserAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateUserAction.java	2009-03-24 14:27:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateUserAction.java	2009-03-24 14:33:11 +0000
@@ -183,6 +183,13 @@
             return INPUT;
         }
 
+        if ( surname == null || surname.trim().length() == 0 )
+        {
+            message = i18n.getString( "specify_surname" );
+
+            return INPUT;
+        }
+
         if ( firstName == null || firstName.trim().length() == 0 )
         {
             message = i18n.getString( "specify_first_name" );
@@ -190,14 +197,7 @@
             return INPUT;
         }
 
-        if ( surname == null || surname.trim().length() == 0 )
-        {
-            message = i18n.getString( "specify_surname" );
-
-            return INPUT;
-        }
-        
-        if ( email != null && !ValidationUtils.emailIsValid( email ) )
+        if ( email != null && email.trim().length() > 0 && !ValidationUtils.emailIsValid( email ) )
         {
             message = i18n.getString( "email_is_not_valid" );
             



--
Trunk
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.