=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-06-01 11:35:55 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2012-10-16 14:18:20 +0000 @@ -57,6 +57,8 @@ */ private static final long serialVersionUID = -1131637847640209166L; + private String image; + @Scanned private Set members = new HashSet(); @@ -161,21 +163,23 @@ return name.equals( other.getName() ); } -/* - @Override - public String toString() - { - return "OrganisationUnitGroup{" + - "members=" + members + - ", groupSet=" + groupSet.getName() + - "} " + super.toString(); - } -*/ - // ------------------------------------------------------------------------- // Getters and setters // ------------------------------------------------------------------------- + @JsonProperty + @JsonView( {DetailedView.class, ExportView.class} ) + @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) + public String getImage() + { + return image; + } + + public void setImage( String image ) + { + this.image = image; + } + @JsonProperty( value = "organisationUnits" ) @JsonSerialize( contentAs = BaseIdentifiableObject.class ) @JsonView( { DetailedView.class, ExportView.class } ) === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2012-06-01 11:35:55 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2012-10-16 14:18:20 +0000 @@ -15,6 +15,8 @@ &identifiableProperties; + +