Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -r061513b8f8f431afd8d4def0ffa2dd6ce157d417 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 061513b8f8f431afd8d4def0ffa2dd6ce157d417) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -164,4 +164,9 @@ * LDEV-4418: Change back button javascript 1.2.26 Release Fixes -* LDEV-4478: Add ability to display LAMS CourseGradebook \ No newline at end of file +==================== +* LDEV-4478: Add ability to display LAMS CourseGradebook + +1.2.27 Release Fixes +==================== +* LDEV-4494: Avoid cloning and importing the lessons created by old NTU plugin \ No newline at end of file Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -r061513b8f8f431afd8d4def0ffa2dd6ce157d417 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 061513b8f8f431afd8d4def0ffa2dd6ce157d417) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -5,7 +5,7 @@ - + Index: lams_bb_integration/build.xml =================================================================== diff -u -r061513b8f8f431afd8d4def0ffa2dd6ce157d417 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/build.xml (.../build.xml) (revision 061513b8f8f431afd8d4def0ffa2dd6ce157d417) +++ lams_bb_integration/build.xml (.../build.xml) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -2,7 +2,7 @@ - + Index: lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/LinkToolsServlet.java =================================================================== diff -u -rdc6d71b150638292aaa1dd2f575e5978604a77a3 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/LinkToolsServlet.java (.../LinkToolsServlet.java) (revision dc6d71b150638292aaa1dd2f575e5978604a77a3) +++ lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/LinkToolsServlet.java (.../LinkToolsServlet.java) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -380,7 +380,7 @@ User teacher = BlackboardUtil.getCourseTeacher(courseId); //find all lessons that should be updated - List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId); + List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId, false); for (Content content : lamsContents) { String _content_id = content.getId().toExternalString(); @@ -446,7 +446,7 @@ User teacher = BlackboardUtil.getCourseTeacher(courseId); //find all lessons that should be updated - List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId); + List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId, false); for (Content content : lamsContents) { String _content_id = content.getId().toExternalString(); @@ -558,7 +558,7 @@ User teacher = BlackboardUtil.getCourseTeacher(courseId); //find all lessons that should be updated - List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId); + List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId, false); for (Content content : lamsContents) { // update lesson id Index: lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/UpdateServerUrlServlet.java =================================================================== diff -u -r54843a5ae3288a977cdfa75fd43afc9c67831624 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/UpdateServerUrlServlet.java (.../UpdateServerUrlServlet.java) (revision 54843a5ae3288a977cdfa75fd43afc9c67831624) +++ lams_bb_integration/src/org/lamsfoundation/bb/integration/servlet/UpdateServerUrlServlet.java (.../UpdateServerUrlServlet.java) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -91,7 +91,7 @@ PkId courseId = new PkId(bbContainer, Course.DATA_TYPE, courseIdParam); //find all lessons that should be updated - List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId); + List lamsContents = BlackboardUtil.getLamsLessonsByCourse(courseId, true); for (Content content : lamsContents) { String oldUrl = content.getUrl(); String newUrl = oldUrl.replaceFirst(oldUrlHost, newUrlHost); Index: lams_bb_integration/src/org/lamsfoundation/bb/integration/util/BlackboardUtil.java =================================================================== diff -u -r54843a5ae3288a977cdfa75fd43afc9c67831624 -rad68e50114d15d3781bf4b34cd60324492f72579 --- lams_bb_integration/src/org/lamsfoundation/bb/integration/util/BlackboardUtil.java (.../BlackboardUtil.java) (revision 54843a5ae3288a977cdfa75fd43afc9c67831624) +++ lams_bb_integration/src/org/lamsfoundation/bb/integration/util/BlackboardUtil.java (.../BlackboardUtil.java) (revision ad68e50114d15d3781bf4b34cd60324492f72579) @@ -84,7 +84,7 @@ * @return list of LAMS lessons * @throws PersistenceException */ - public static List getLamsLessonsByCourse(PkId courseId) throws PersistenceException { + public static List getLamsLessonsByCourse(PkId courseId, boolean includeLessonsCreatedByOldNtuPlugin) throws PersistenceException { ContentDbLoader contentLoader = ContentDbLoader.Default.getInstance(); CourseTocDbLoader cTocDbLoader = CourseTocDbLoader.Default.getInstance(); @@ -107,7 +107,7 @@ for (Content content : contents) { // only LAMS content if ("resource/x-lams-lamscontent".equals(content.getContentHandler()) - || content.getContentHandler().equals("resource/x-ntu-hdllams")) { + || includeLessonsCreatedByOldNtuPlugin && content.getContentHandler().equals("resource/x-ntu-hdllams")) { lamsContents.add(content); } }