------------------------------------------------------------
revno: 13838
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Fri 2014-01-24 11:47:13 +0700
message:
minor fix to event api
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 2014-01-14 11:12:16 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-24 04:47:13 +0000
@@ -259,7 +259,16 @@
}
programInstance = programInstances.get( 0 );
- programStageInstance = programInstance.getProgramStageInstanceByStage( 1 );
+
+ if ( event.getEvent() != null )
+ {
+ programStageInstance = programStageInstanceService.getProgramStageInstance( event.getEvent() );
+
+ if ( programStageInstance == null )
+ {
+ return new ImportSummary( ImportStatus.ERROR, "Event.event did not point to a valid event" );
+ }
+ }
}
OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( event.getOrgUnit() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
