← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2626: Fixed chart bug

 

------------------------------------------------------------
revno: 2626
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-18 19:58:06 +0100
message:
  Fixed chart bug
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.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/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-01-13 15:44:09 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-01-18 18:58:06 +0000
@@ -116,7 +116,11 @@
         allPeriods.addAll( periods );
         allPeriods.addAll( relativePeriods );
         allOrganisationUnits.addAll( organisationUnits );
-        allOrganisationUnits.add( organisationUnit );
+        
+        if ( organisationUnit != null )
+        {
+            allOrganisationUnits.add( organisationUnit );
+        }
     }
     
     // -------------------------------------------------------------------------