=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2012-05-17 09:11:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2012-05-28 16:45:01 +0000
@@ -222,7 +222,14 @@
         }
         else if ( DIMENSION_ORGANISATIONUNIT.equals( dimension ) )
         {
-            list.addAll( getAllOrganisationUnits() );
+            if ( isOrganisationUnitGroupBased() )
+            {
+                list.addAll( organisationUnitGroupSet.getOrganisationUnitGroups() );
+            }
+            else
+            {
+                list.addAll( getAllOrganisationUnits() );
+            }
         }
 
         return list;
@@ -241,6 +248,15 @@
     // Logic
     // -------------------------------------------------------------------------
 
+    /**
+     * Indicates whether this report table is based on organisation unit groups
+     * or the organisation unit hierarchy.
+     */
+    public boolean isOrganisationUnitGroupBased()
+    {
+        return organisationUnitGroupSet != null && organisationUnitGroupSet.getOrganisationUnitGroups() != null;
+    }
+
     public void removeAllOrganisationUnits()
     {
         organisationUnits.clear();