dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6748
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-04-25 22:43:17 +0200
message:
  Put back xml annotations on ListGrid
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.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-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	2012-04-03 08:51:42 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java	2012-04-25 20:43:17 +0000
@@ -122,6 +122,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlProperty
     public String getTitle()
     {
         return title;
@@ -136,6 +137,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlProperty
     public String getSubtitle()
     {
         return subtitle;
@@ -150,6 +152,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlProperty
     public String getTable()
     {
         return table;
@@ -197,6 +200,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlProperty
     public int getHeight()
     {
         return (grid != null && grid.size() > 0) ? grid.size() : 0;
@@ -204,6 +208,7 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlProperty
     public int getWidth()
     {
         verifyGridState();
@@ -241,6 +246,8 @@
 
     @JsonProperty
     @JsonView( {DetailedView.class} )
+    @JacksonXmlElementWrapper( localName = "rows" )
+    @JacksonXmlProperty( localName = "row" )
     public List<List<Object>> getRows()
     {
         return grid;

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java	2012-03-22 15:04:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java	2012-04-25 20:43:17 +0000
@@ -158,6 +158,7 @@
         Grid grid = reportTableService.getReportTableGrid( uid, i18nManager.getI18nFormat(), date, organisationUnitUid );
 
         model.addAttribute( "model", grid );
+        model.addAttribute( "view", "detailed" );
 
         return "grid";
     }