------------------------------------------------------------
revno: 19391
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Sun 2015-06-14 14:36:27 +0200
message:
Analytics, minor
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-06-13 14:19:23 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-06-14 12:36:27 +0000
@@ -541,17 +541,14 @@
@Override
public Grid getAggregatedDataValues( DataQueryParams params, boolean tableLayout, List<String> columns, List<String> rows )
{
- Grid grid = null;
-
if ( !tableLayout )
{
return getAggregatedDataValues( params );
}
- else
- {
- params.setOutputIdScheme( null );
- grid = getAggregatedDataValues( params );
- }
+
+ params.setOutputIdScheme( null );
+
+ Grid grid = getAggregatedDataValues( params );
ListUtils.removeEmptys( columns );
ListUtils.removeEmptys( rows );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
