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.35 -r1.36
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	13 Nov 2008 22:33:19 -0000	1.35
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	13 Nov 2008 23:12:00 -0000	1.36
@@ -268,5 +268,19 @@
 			AND gi.grouping_id = g.grouping_id
 			AND g.group_id = gi.staff_group_id
 	</sql-query>
-
+	
+	<sql-query name="lessonsByOrgAndUserWithChildOrgs">
+ 		<return alias="lesson" class="org.lamsfoundation.lams.lesson.Lesson" />
+ 		SELECT DISTINCT {lesson.*}
+ 			FROM (lams_lesson {lesson}, lams_learning_design ld, lams_group g, lams_user_group ug, lams_organisation lo)
+ 			WHERE {lesson}.learning_design_id = ld.learning_design_id
+				AND ld.copy_type_id != 3
+				AND ({lesson}.organisation_id = lo.organisation_id)
+				AND (lo.organisation_id = :orgId or lo.parent_organisation_id = :orgId)
+				AND {lesson}.class_grouping_id = g.grouping_id
+				AND {lesson}.lesson_state_id != 7
+				AND ug.group_id = g.group_id
+				AND ug.user_id = :userId
+	</sql-query>
+	
 </hibernate-mapping>