------------------------------------------------------------
revno: 13718
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 17:37:53 +0700
message:
csd: remove dhis2-code from otherID since its now being used for OID
modified:
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/webapi/CsdController.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/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/webapi/CsdController.java 2014-01-14 09:58:09 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/webapi/CsdController.java 2014-01-14 10:37:53 +0000
@@ -93,15 +93,10 @@
for ( OrganisationUnit organisationUnit : organisationUnits )
{
Facility facility = new Facility();
- facility.setOid( organisationUnit.getCode() ); // TODO use code for OID?
+ facility.setOid( organisationUnit.getCode() ); // TODO skip if code is null??
facility.getOtherID().add( new OtherID( organisationUnit.getUid(), "dhis2-uid" ) );
- if ( organisationUnit.getCode() != null )
- {
- facility.getOtherID().add( new OtherID( organisationUnit.getCode(), "dhis2-code" ) );
- }
-
facility.setPrimaryName( organisationUnit.getDisplayName() );
for ( OrganisationUnitGroup organisationUnitGroup : organisationUnit.getGroups() )
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
