dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14810
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5133: local vn - Fixed NPE
------------------------------------------------------------
revno: 5133
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-11-10 16:01:47 +0700
message:
local vn - Fixed NPE
modified:
local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java 2011-10-17 08:39:58 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/exporting/action/GetExportReportsByGroupAction.java 2011-11-10 09:01:47 +0000
@@ -122,16 +122,16 @@
.getCurrentUser(), currentUserService.currentUserIsSuper(), group ) );
Collection<ExportReport> reportAssociation = exportReportService
- .getExportReportsByOrganisationUnit( organisationUnitSelectionManager.getSelectedOrganisationUnit() );
+ .getExportReportsByOrganisationUnit( organisationUnit );
exportReports.retainAll( reportAssociation );
Collections.sort( exportReports, new ExportReportNameComparator() );
-
+
String periodTypeName = null;
for ( ExportReport exportReport : exportReports )
- {
+ {
for ( ExportItem exportItem : exportReport.getExportItems() )
{
periodTypeName = exportItem.getPeriodType();