=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2013-06-05 20:11:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2013-06-06 07:31:24 +0000
@@ -145,7 +145,7 @@
+ foreign-key="fk_reporttable_legendsetid" />
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2013-06-05 20:11:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java 2013-06-06 07:31:24 +0000
@@ -106,6 +106,9 @@
@Autowired
private DimensionService dimensionService;
+
+ @Autowired
+ private MappingService mappingService;
@Autowired
private I18nManager i18nManager;
@@ -304,6 +307,11 @@
reportTable.getColumnDimensions().addAll( getUniqueDimensions( reportTable.getColumns() ) );
reportTable.getRowDimensions().addAll( getUniqueDimensions( reportTable.getRows() ) );
- reportTable.getFilterDimensions().addAll( getUniqueDimensions( reportTable.getFilters() ) );
+ reportTable.getFilterDimensions().addAll( getUniqueDimensions( reportTable.getFilters() ) );
+
+ if ( reportTable.getLegendSet() != null )
+ {
+ reportTable.setLegendSet( mappingService.getMapLegendSet( reportTable.getLegendSet().getUid() ) );
+ }
}
}