Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r74c386b0cfaf30c516de58fafbe9a939d101e264 -r57c67cb560b7623b59a2fa25090641743141a09d Binary files differ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml =================================================================== diff -u -rb5b6e30e2f0f6f459f92da9a26b50f62e3292134 -r57c67cb560b7623b59a2fa25090641743141a09d --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml (.../LearnerProgress.hbm.xml) (revision b5b6e30e2f0f6f459f92da9a26b50f62e3292134) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml (.../LearnerProgress.hbm.xml) (revision 57c67cb560b7623b59a2fa25090641743141a09d) @@ -64,7 +64,7 @@ + class="org.lamsfoundation.lams.lesson.Lesson" not-null="true" lazy="false"> Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml =================================================================== diff -u -r0ec0d87a13f5cd499a8300d7a51a6d453108545e -r57c67cb560b7623b59a2fa25090641743141a09d --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision 0ec0d87a13f5cd499a8300d7a51a6d453108545e) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision 57c67cb560b7623b59a2fa25090641743141a09d) @@ -53,7 +53,8 @@ + not-null="true" + lazy="false"> Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r03392c988a23f5e9129967f8ae692488213632fe -r57c67cb560b7623b59a2fa25090641743141a09d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 57c67cb560b7623b59a2fa25090641743141a09d) @@ -269,7 +269,6 @@ newDesign.setLicenseText(design.getLicenseText()); newDesign.setLastModifiedDateTime(new Date()); - // is this really right? why are preview set to read only when we will delete them? do we set them to not read only later? if(designCopyType.intValue()!=COPY_TYPE_NONE) newDesign.setReadOnly(new Boolean(true)); else Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r0ec0d87a13f5cd499a8300d7a51a6d453108545e -r57c67cb560b7623b59a2fa25090641743141a09d --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 0ec0d87a13f5cd499a8300d7a51a6d453108545e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 57c67cb560b7623b59a2fa25090641743141a09d) @@ -471,4 +471,10 @@ return new LessonDetailsDTO(this); } + /** Is this lesson a preview lesson? ie is it attached to a preview learning design? */ + public boolean isPreviewLesson() { + Integer copyTypeID = getLearningDesign().getCopyTypeID(); + return ( copyTypeID != null && LearningDesign.COPY_TYPE_PREVIEW == copyTypeID.intValue() ); + } + }