------------------------------------------------------------
revno: 11142
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Wed 2013-06-05 17:59:40 +0200
message:
Analytics, fixed bug, removed pointless restriction
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.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/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-05-29 18:35:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-06-05 15:59:40 +0000
@@ -154,8 +154,8 @@
/**
* Ensures conformity for this query. The category option combo dimension
- * and any category dimensions can only be present if the data element
- * dimension exists and the indicator and data set dimensions do not exist.
+ * can only be present if the data element dimension exists and the indicator
+ * and data set dimensions do not exist.
*/
public DataQueryParams conform()
{
@@ -164,7 +164,6 @@
dimensions.contains( new BaseDimensionalObject( DATASET_DIM_ID ) ) )
{
removeDimension( CATEGORYOPTIONCOMBO_DIM_ID );
- removeDimensions( DimensionType.CATEGORY );
}
return this;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
