=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java 2011-01-11 07:06:28 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java 2011-03-28 07:46:07 +0000 @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collection; +import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; import org.hisp.dhis.patient.Patient; import org.hisp.dhis.patient.PatientService; import org.hisp.dhis.patient.state.SelectedStateManager; @@ -71,7 +72,7 @@ { this.programService = programService; } - + // ------------------------------------------------------------------------- // Input/Output // ------------------------------------------------------------------------- @@ -168,7 +169,8 @@ // Load Programs // --------------------------------------------------------------------- - programs = programService.getAllPrograms(); + programs = programService.getPrograms( selectedStateManager.getSelectedOrganisationUnit() ); +// programs = programService.getAllPrograms(); // --------------------------------------------------------------------- // Validate selected Program