=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/SelectFormAction.java' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/SelectFormAction.java 2009-12-09 08:57:51 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/SelectFormAction.java 2010-01-18 04:33:00 +0000 @@ -121,6 +121,8 @@ { organisationUnit = organisationUnitSelectionManager.getSelectedOrganisationUnit(); + groups = new ArrayList( reportService.getReportExcelGroups() ); + if ( organisationUnit == null ) { return SUCCESS; @@ -130,8 +132,6 @@ periods = periodDatabaseService.getPeriodList(); - groups = new ArrayList( reportService.getReportExcelGroups() ); - Collections.sort( groups ); return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2010-01-18 03:21:24 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitems.vm 2010-01-18 04:33:00 +0000 @@ -3,7 +3,7 @@
- $i18n.getString( "filter_by_name" ): + $i18n.getString( "filter_by_name" ):