dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10152
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-03-12 15:47:44 +0700
message:
  FRED-API: renamed url => href in hierarchy
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-03-10 15:28:06 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java	2013-03-12 08:47:44 +0000
@@ -205,7 +205,7 @@
             facility.setCoordinates( null );
         }
 
-        if ( !strings.contains( "url" ) )
+        if ( !strings.contains( "href" ) )
         {
             facility.setHref( null );
         }
@@ -434,7 +434,7 @@
             level.put( "id", organisationUnitLevel.getUid() );
 
             // temporary fix since ControllerLinkBuilder can't handle cross-servlet controllers
-            level.put( "url", linkTo( OrganisationUnitLevelController.class ).slash( organisationUnitLevel.getUid() ).toString()
+            level.put( "href", linkTo( OrganisationUnitLevelController.class ).slash( organisationUnitLevel.getUid() ).toString()
                 .replace( "/api-fred", "/api" ) );
 
             level.put( "name", organisationUnitLevel.getName() );