------------------------------------------------------------
revno: 5110
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Thu 2011-11-03 21:43:59 +0100
message:
fixed stupid attribute bug, attributes now work correctly for orgunits
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.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-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2011-10-20 18:51:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2011-11-03 20:43:59 +0000
@@ -189,7 +189,7 @@
groupSets = new ArrayList<OrganisationUnitGroupSet>(
organisationUnitGroupService.getCompulsoryOrganisationUnitGroupSetsWithMembers() );
- attributes = new ArrayList<Attribute>( attributeService.getDataElementAttributes() );
+ attributes = new ArrayList<Attribute>( attributeService.getOrganisationUnitAttributes() );
attributeValues = AttributeUtils.getAttributeValueMap( organisationUnit.getAttributeValues() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java 2011-09-23 18:54:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/PrepareAddOrganisationUnitAction.java 2011-11-03 20:43:59 +0000
@@ -122,7 +122,7 @@
groupSets = new ArrayList<OrganisationUnitGroupSet>(
organisationUnitGroupService.getCompulsoryOrganisationUnitGroupSetsWithMembers() );
- attributes = new ArrayList<Attribute>( attributeService.getDataElementAttributes() );
+ attributes = new ArrayList<Attribute>( attributeService.getOrganisationUnitAttributes() );
Collections.sort( dataSets, new DataSetNameComparator() );
Collections.sort( groupSets, new OrganisationUnitGroupSetNameComparator() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
