dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7406
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-06-26 23:04:37 +0200
message:
  Minor fix to users
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.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-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2012-06-25 18:07:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2012-06-26 21:04:37 +0000
@@ -204,16 +204,6 @@
         return userStore.getByUid( uid );
     }
 
-    public int getUserCount()
-    {
-        return userStore.getCount();
-    }
-
-    public int getUserCountByName( String userName )
-    {
-        return userStore.getCountByName( userName );
-    }
-
     public Collection<UserCredentials> getUsers( final Collection<Integer> identifiers, User user )
     {
         Collection<UserCredentials> userCredentialsS = getAllUserCredentials();
@@ -391,6 +381,16 @@
         return userCredentialsStore.getUsersBetweenByName( username, first, max );
     }
 
+    public int getUserCount()
+    {
+        return userCredentialsStore.getUserCount();
+    }
+
+    public int getUserCountByName( String userName )
+    {
+        return userCredentialsStore.getUserCountByName( userName );
+    }
+
     public Collection<UserCredentials> getUsersWithoutOrganisationUnitBetween( int first, int max )
     {
         return userCredentialsStore.getUsersWithoutOrganisationUnitBetween( first, max );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2012-06-25 18:21:40 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2012-06-26 21:04:37 +0000
@@ -223,11 +223,11 @@
                 }
                 else if ( values[5] != null || !values[5].isEmpty() ) //Boolean
                 {
-                    value.setValue("false");
+                    value.setValue( "false" );
 
-                    if  ( values[5].trim().equals("1")  )
+                    if  ( values[5].trim().equals( "1" )  )
                     {
-                        value.setValue("true");
+                        value.setValue( "true" );
                     }
 
                 }