dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19949
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-09-03 11:17:21 +0700
message:
  minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.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/common/ValueType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java	2015-09-03 02:58:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java	2015-09-03 04:17:21 +0000
@@ -159,23 +159,23 @@
                 return ValueType.NUMBER;
             }
         }
-        else if ( DataElement.VALUE_TYPE_BOOL.equals( numberType ) )
+        else if ( DataElement.VALUE_TYPE_BOOL.equals( type ) )
         {
             return ValueType.BOOLEAN;
         }
-        else if ( DataElement.VALUE_TYPE_TRUE_ONLY.equals( numberType ) )
+        else if ( DataElement.VALUE_TYPE_TRUE_ONLY.equals( type ) )
         {
             return ValueType.TRUE_ONLY;
         }
-        else if ( DataElement.VALUE_TYPE_DATE.equals( numberType ) )
+        else if ( DataElement.VALUE_TYPE_DATE.equals( type ) )
         {
             return ValueType.DATE;
         }
-        else if ( DataElement.VALUE_TYPE_DATETIME.equals( numberType ) )
+        else if ( DataElement.VALUE_TYPE_DATETIME.equals( type ) )
         {
             return ValueType.DATETIME;
         }
-        else if ( DataElement.VALUE_TYPE_USER_NAME.equals( numberType ) )
+        else if ( DataElement.VALUE_TYPE_USER_NAME.equals( type ) )
         {
             return ValueType.USERNAME;
         }

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java	2015-08-31 09:10:26 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java	2015-09-03 04:17:21 +0000
@@ -315,6 +315,7 @@
         }
 
         ValueType valueType = dataElement.getValueType();
+        System.err.println( "valueType: " + valueType );
 
         if ( value.length() > VALUE_MAX_LENGTH )
         {