dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13538: set application/json ct on GET facilitities/facilities-uid

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 02 Jan 2014 13:20:42 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 13538
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-01-02 14:19:58 +0100
message:
  set application/json ct on GET facilitities/facilities-uid
modified:
  dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.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-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java	2013-12-01 22:32:50 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java	2014-01-02 13:19:58 +0000
@@ -310,6 +310,7 @@
             }
         }
 
+        response.setContentType( MediaType.APPLICATION_JSON_VALUE );
         objectMapper.writeValue( response.getOutputStream(), facilities );
     }
 
@@ -558,6 +559,7 @@
             facility.setHref( facility.getHref() + ".json" );
         }
 
+        response.setContentType( MediaType.APPLICATION_JSON_VALUE );
         objectMapper.writeValue( response.getOutputStream(), facility );
     }