=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java 2012-01-23 10:49:32 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java 2013-06-28 19:06:47 +0000 @@ -29,12 +29,14 @@ import com.opensymphony.xwork2.Action; import org.apache.commons.lang.Validate; +import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.light.utils.FormUtils; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -114,6 +116,8 @@ dataSets = formUtils.getDataSetsForCurrentUser( organisationUnitId ); + Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE ); + organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitId ); if ( dataSets.size() == 1 )