Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/monitoring/Attic/Organisation.as,v
diff -u -r1.7 -r1.7.2.1
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/wizard/Attic/Wizard.as,v
diff -u -r1.11.2.1 -r1.11.2.2
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/wizard/Attic/WizardController.as,v
diff -u -r1.9.2.1 -r1.9.2.2
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java,v
diff -u -r1.11 -r1.11.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	17 Sep 2006 06:14:19 -0000	1.11
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	20 Aug 2007 06:56:20 -0000	1.11.2.1
@@ -45,12 +45,14 @@
 	private Vector<String> roleNames;
 	private Vector<OrganisationDTO> nodes;
 	private Integer organisationTypeId;
+	private Boolean canJoinJointLessons;
+	private Boolean canOfferJointLessons;
 	
 	public OrganisationDTO(){
 		
 	}	
 	public OrganisationDTO(Integer organisationID, Integer parentID, String name,
-			String description, Integer organisationTypeId) {
+			String description, Integer organisationTypeId, Boolean canJoinJointLessons, Boolean canOfferJointLessons) {
 		super();
 		this.organisationID = organisationID;
 		this.parentID = parentID;
@@ -59,6 +61,8 @@
 		this.organisationTypeId = organisationTypeId;
 		this.roleNames = new Vector<String>();
 		this.nodes = new Vector<OrganisationDTO>();
+		this.canJoinJointLessons = canJoinJointLessons;
+		this.canOfferJointLessons = canOfferJointLessons;
 	}
 	public OrganisationDTO(Organisation organisation){
 		this.organisationID = organisation.getOrganisationId();
@@ -68,6 +72,8 @@
 		this.organisationTypeId = organisation.getOrganisationType().getOrganisationTypeId();
 		this.roleNames = new Vector<String>();
 		this.nodes = new Vector<OrganisationDTO>();
+		this.canJoinJointLessons = organisation.getCanJoinJointLessons();
+		this.canOfferJointLessons = organisation.getCanOfferJointLessons();
 	}
 	/**
 	 * @return Returns the description.
@@ -99,6 +105,16 @@
 	public Integer getOrganisationTypeId() {
 		return organisationTypeId;
 	}
+	
+	/** Get the offer joint lessons flag */
+	public Boolean getCanOfferJointLessons() {
+		return canOfferJointLessons!=null?canOfferJointLessons:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
+	
+	/** Get the join joint lessons flag */
+	public Boolean getCanJoinJointLessons() {
+		return canJoinJointLessons!=null?canJoinJointLessons:WDDXTAGS.BOOLEAN_NULL_VALUE;
+	}
 
 	public void addNode(OrganisationDTO organisation){
 		nodes.add(organisation);
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java,v
diff -u -r1.2 -r1.2.2.1
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java	17 Sep 2006 06:14:19 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java	20 Aug 2007 06:56:20 -0000	1.2.2.1
@@ -46,7 +46,7 @@
 		while(it.hasNext()){
 			if(rootOrgDTO == null) {
 				/** create dummy root for tree and add first element as child node */
-				OrganisationDTO rt = new OrganisationDTO(new Integer(-1), new Integer(-1), "Root", "Root Description", new Integer(1));
+				OrganisationDTO rt = new OrganisationDTO(new Integer(-1), new Integer(-1), "Root", "Root Description", new Integer(1), new Boolean(false), new Boolean(false));
 				OrganisationDTO initial = (OrganisationDTO) it.next();
 				rt.addNode(initial);
 				rootOrgDTO = rt;