Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r50f06594944a995d2cdd0cb10f02d5c56bfdd6de --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision 50f06594944a995d2cdd0cb10f02d5c56bfdd6de) @@ -32,21 +32,24 @@ public class OrganisationDTO { private Integer organisationID; + private Integer parentID; private String name; private String description; public OrganisationDTO(){ } - public OrganisationDTO(Integer organisationID, String name, + public OrganisationDTO(Integer organisationID, Integer parentID, String name, String description) { super(); this.organisationID = organisationID; + this.parentID = parentID; this.name = name; this.description = description; } public OrganisationDTO(Organisation organisation){ this.organisationID = organisation.getOrganisationId(); + this.parentID = organisation.getParentOrganisation().getOrganisationId(); this.name = organisation.getName(); this.description = organisation.getDescription(); } @@ -68,4 +71,11 @@ public Integer getOrganisationID() { return organisationID!=null?organisationID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } + + /** + * @return Returns the parent organisationID. + */ + public Integer getParentID() { + return parentID!=null?parentID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } }