------------------------------------------------------------
revno: 19902
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Mon 2015-08-31 14:45:43 +0700
message:
minor fix
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.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-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2015-08-31 07:42:50 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2015-08-31 07:45:43 +0000
@@ -747,11 +747,10 @@
for ( NameableObject element : dataElements )
{
- DataElement de = (DataElement) element;
-
- DataType dataType = DataElement.VALUE_TYPE_STRING.equals( de.getType() ) ? DataType.TEXT : DataType.NUMERIC;
-
- map.putValue( dataType, de );
+ DataElement dataElement = (DataElement) element;
+ DataType dataType = dataElement.getValueType().isText() ? DataType.TEXT : DataType.NUMERIC;
+
+ map.putValue( dataType, dataElement );
}
return map;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
