=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-04-10 07:27:08 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-04-14 14:17:32 +0000 @@ -751,7 +751,7 @@ } /** - * Clear or set to false all persistent properties for this object. + * Clear or set to false all persistent dimensional (not option) properties for this object. */ public void clear() { @@ -771,10 +771,6 @@ userOrganisationUnitGrandChildren = false; organisationUnitLevels.clear(); itemOrganisationUnitGroups.clear(); - rewindRelativePeriods = false; - digitGroupSeparator = NUMBER_FORMATTING_SPACE; - sortOrder = NONE; - topLimit = 0; } @Override @@ -1058,7 +1054,7 @@ } @JsonProperty - @JsonView( {DetailedView.class, ExportView.class} ) + @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0) public boolean isRewindRelativePeriods() { @@ -1071,7 +1067,7 @@ } @JsonProperty - @JsonView( { DetailedView.class, ExportView.class } ) + @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getDigitGroupSeparator() { @@ -1084,7 +1080,7 @@ } @JsonProperty - @JsonView( { DetailedView.class, ExportView.class } ) + @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public int getSortOrder() { @@ -1097,7 +1093,7 @@ } @JsonProperty - @JsonView( { DetailedView.class, ExportView.class } ) + @JsonView( {DetailedView.class, ExportView.class, DimensionalView.class} ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public int getTopLimit() { === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2014-04-14 14:04:32 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2014-04-14 14:17:32 +0000 @@ -681,7 +681,7 @@ // Sort and limit // --------------------------------------------------------------------- - if ( sortOrder != ReportTable.NONE ) + if ( sortOrder != BaseAnalyticalObject.NONE ) { grid.sortGrid( grid.getWidth(), sortOrder ); }