------------------------------------------------------------
revno: 20034
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-09-08 09:17:53 +0200
message:
Analytics, returning name for periods in meta-data for short name
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-09-04 14:25:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-09-08 07:17:53 +0000
@@ -1140,7 +1140,9 @@
for ( Period period : periods )
{
- period.setName( format != null ? format.formatPeriod( period ) : null );
+ String name = format != null ? format.formatPeriod( period ) : null;
+ period.setName( name );
+ period.setShortName( name );
if ( !calendar.isIso8601() )
{
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
