=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java 2011-01-06 09:03:29 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java 2011-01-18 14:33:30 +0000 @@ -296,13 +296,34 @@ private ReportTable getReportTable() throws Exception - { - List dataElements = getList( dataElementService.getDataElements( getIntegerCollection( selectedDataElements ) ) ); - List indicators = getList( indicatorService.getIndicators( getIntegerCollection( selectedIndicators ) ) ); - List dataSets = getList( dataSetService.getDataSets( getIntegerCollection( selectedDataSets ) ) ); - List periods = getList( periodService.getPeriodsByExternalIds( selectedPeriods ) ); - List units = getList( organisationUnitService.getOrganisationUnits( getIntegerCollection( selectedOrganisationUnits ) ) ); + { + List periods = getList( periodService.getPeriodsByExternalIds( selectedPeriods ) ); + + List dataElements = new ArrayList(); + List indicators = new ArrayList(); + List dataSets = new ArrayList(); + List units = new ArrayList(); + for ( Integer id : getIntegerCollection( selectedDataElements ) ) + { + dataElements.add( dataElementService.getDataElement( id ) ); + } + + for ( Integer id : getIntegerCollection( selectedIndicators ) ) + { + indicators.add( indicatorService.getIndicator( id ) ); + } + + for ( Integer id : getIntegerCollection( selectedDataSets ) ) + { + dataSets.add( dataSetService.getDataSet( id ) ); + } + + for ( Integer id : getIntegerCollection( selectedOrganisationUnits ) ) + { + units.add( organisationUnitService.getOrganisationUnit( id ) ); + } + DimensionSet dimensionSet = dimensionService.getDimensionSet( dimensionSetId ); RelativePeriods relatives = new RelativePeriods( reportingMonth, monthsThisYear, quartersThisYear, thisYear, monthsLastYear, quartersLastYear, lastYear );