Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml,v
diff -u -r1.32 -r1.33
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	7 Nov 2008 06:19:28 -0000	1.32
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	12 Nov 2008 01:01:33 -0000	1.33
@@ -266,18 +266,19 @@
 			AND g.group_id = gi.staff_group_id
 	</sql-query>
 	
-	<sql-query name="lessonsByOrgAndUser">
+	<sql-query name="lessonsByOrgAndUserWithChildOrgs">
 		<return-scalar column="lesson_id" type="long" />
 		<return-scalar column="name" type="string" />
 		<return-scalar column="description" type="string" />
 		<return-scalar column="lesson_state_id" type="integer" />
 		<return-scalar column="lesson_completed_flag" type="boolean" />
 		SELECT l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag
-		  FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug)
+		  FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_organisation lo)
 		    LEFT JOIN lams_learner_progress lp ON lp.user_id = ug.user_id AND lp.lesson_id = l.lesson_id	    
 		  WHERE l.learning_design_id = ld.learning_design_id
 		    AND ld.copy_type_id != 3
-			AND l.organisation_id = :orgId
+			AND (l.organisation_id = lo.organisation_id)
+			AND (lo.organisation_id = :orgId or lo.parent_organisation_id = :orgId)
 			AND l.class_grouping_id = g.grouping_id
 			AND l.lesson_state_id != 7
 			AND ug.group_id = g.group_id