← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12876: PNG maps, fixed bug, data set/reporting rate names not display properly

 

------------------------------------------------------------
revno: 12876
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-11-04 19:48:23 +0100
message:
  PNG maps, fixed bug, data set/reporting rate names not display properly
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.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/mapping/MapView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2013-10-16 10:26:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2013-11-04 18:48:23 +0000
@@ -182,6 +182,10 @@
         {
             return dataElementOperands.get( 0 ).getName();
         }
+        else if ( dataSets != null && !dataSets.isEmpty() )
+        {
+            return dataSets.get( 0 ).getName();
+        }
         
         return uid;
     }