=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-12-05 11:51:31 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-12-05 11:59:12 +0000 @@ -198,7 +198,7 @@ // --------------------------------------------------------------------- grid.addHeader( new GridHeader( ITEM_EVENT, "Event" ) ); - grid.addHeader( new GridHeader( ITEM_PROGRAM_STAGE, "Program stage" ) ); + grid.addHeader( new GridHeader( ITEM_PROGRAM_STAGE, "Program stage", String.class.getName(), false, true ) ); grid.addHeader( new GridHeader( ITEM_EXECUTION_DATE, "Event date" ) ); grid.addHeader( new GridHeader( ITEM_LONGITUDE, "Longitude" ) ); grid.addHeader( new GridHeader( ITEM_LATITUDE, "Latitude" ) ); === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java 2013-10-08 17:14:50 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java 2013-12-05 11:59:12 +0000 @@ -589,17 +589,17 @@ { GridHeader header = headers.get( colIndex ); + // Header + + Object headerMetaName = metaDataMap.get( header.getName() ); + + if ( headerMetaName != null ) + { + header.setName( String.valueOf( headerMetaName ) ); + } + if ( header.isMeta() ) { - // Header - - Object headerMetaName = metaDataMap.get( header.getName() ); - - if ( headerMetaName != null ) - { - header.setName( String.valueOf( headerMetaName ) ); - } - // Column cells List col = getColumn( colIndex );