Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -rcd6dafbd447f0b37e9006aa26743a08880b07869 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision cd6dafbd447f0b37e9006aa26743a08880b07869) @@ -69,6 +69,8 @@ /** persistent field */ private Set lessons; + private OrganisationState organisationState; + /** full constructor */ public Organisation(String name, String description, Organisation parentOrganisation, Date createDate, Workspace workspace, OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons) { this.name = name; @@ -261,7 +263,21 @@ this.lessons = lessons; } - public String toString() { + /** + * @hibernate.many-to-one + * not-null="true" + * @hibernate.column name="organisation_state_id" + * + */ + public OrganisationState getOrganisationState() { + return this.organisationState; + } + + public void setOrganisationState(OrganisationState organisationState) { + this.organisationState = organisationState; + } + + public String toString() { return new ToStringBuilder(this) .append("organisationId", getOrganisationId()) .toString();