← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12013: Minor

 

------------------------------------------------------------
revno: 12013
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-10 13:58:08 +0200
message:
  Minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.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/dashboard/DashboardItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java	2013-09-10 11:56:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java	2013-09-10 11:58:08 +0000
@@ -210,6 +210,7 @@
         count += reportTables.size();
         count += reports.size();
         count += resources.size();
+        count += patientTabularReports.size();
         return count;
     }
 
@@ -234,9 +235,13 @@
         {
             return removeContent( uid, reports );
         }
+        else if ( !resources.isEmpty() )
+        {
+            return removeContent( uid, resources );
+        }
         else
         {
-            return removeContent( uid, resources );
+            return removeContent( uid, patientTabularReports );
         }
     }