dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/2.0.6] Rev 2752: (GIS) Forthcoming periods filtered out.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 02 Feb 2011 13:43:32 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2752
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: 2.0.6
timestamp: Wed 2011-02-02 14:41:02 +0100
message:
  (GIS) Forthcoming periods filtered out.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java


--
lp:~dhis2-devs-core/dhis2/2.0.6
https://code.launchpad.net/~dhis2-devs-core/dhis2/2.0.6

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-devs-core/dhis2/2.0.6.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/2.0.6/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java	2011-02-02 13:41:02 +0000
@@ -104,6 +104,8 @@
                 period.setName( format.formatPeriod( period ) );
             }
             
+            FilterUtils.filter( object, new PastAndCurrentPeriodFilter() );
+            
             Collections.sort( object, new PeriodComparator() );
         }