dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8674
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-23 18:55:21 +0200
message:
  Fixed minor bug with standard report parameters
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java	2012-10-14 14:39:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java	2012-10-23 16:55:21 +0000
@@ -59,8 +59,8 @@
      * 
      * "periods" String of relative period ids (String)
      * "organisationunits" String of selected organisation unit ids (String)
-     * "reporting_month_name" Name of the selected period (String)
-     * "param_organisationunit_name" Name of the selected organisation unit (String)
+     * "period_name" Name of the selected period (String)
+     * "organisationunit_name" Name of the selected organisation unit (String)
      * "organisationunit_level" Level of the selected organisation unit (int)
      * "organisationunit_level_column" Name of the relevant level column in  (String)
      *     table _orgunitstructure.

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2012-10-14 14:39:23 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2012-10-23 16:55:21 +0000
@@ -183,7 +183,7 @@
 
                 if ( report.hasRelativePeriods() )
                 {
-                    Collection<Period> periods = periodService.reloadPeriods( report.getRelatives().getRelativePeriods() );
+                    Collection<Period> periods = periodService.reloadPeriods( report.getRelatives().getRelativePeriods( reportDate, null, false ) );
                     String periodString = getCommaDelimitedString( getIdentifiers( Period.class, periods ) );
                     params.put( PARAM_RELATIVE_PERIODS, periodString );
                 }