------------------------------------------------------------
revno: 21554
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-12-30 15:08:48 +0100
message:
Event query. Removed check for attribute option combo which is stricly not
necessary. One might want to get events for all attribute option combos.
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-12-30 14:01:35 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-12-30 14:08:48 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.commons.collection.CachingMap;
import org.hisp.dhis.commons.util.DebugUtils;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
@@ -553,26 +552,6 @@
throw new IllegalQueryException( "Tracked entity instance is specified but does not exist: " + trackedEntityInstance );
}
- if ( attributeCoc.isDefault() )
- {
- DataElementCategoryCombo cc = null;
-
- if ( pr != null )
- {
- cc = pr.getCategoryCombo();
- }
-
- if ( cc == null && ps != null )
- {
- cc = ps.getProgram().getCategoryCombo();
- }
-
- if ( cc != null && !cc.isDefault() )
- {
- throw new IllegalQueryException( "Default attribute option combo is specified while program has non-default attribute category combo: " + cc.getUid() );
- }
- }
-
params.setProgram( pr );
params.setProgramStage( ps );
params.setOrgUnit( ou );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
