=== 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() );
         }