Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.44 -r1.420.2.45 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml,v diff -u -r1.8.18.6 -r1.8.18.7 --- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml 10 Aug 2015 15:24:15 -0000 1.8.18.6 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml 24 Nov 2015 14:30:57 -0000 1.8.18.7 @@ -47,6 +47,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java,v diff -u -r1.33.2.7 -r1.33.2.8 --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java 23 Nov 2015 11:49:54 -0000 1.33.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java 24 Nov 2015 14:30:57 -0000 1.33.2.8 @@ -251,7 +251,7 @@ * @param users * the users to set as staff */ - void setLearners(Lesson lesson, Collection users) throws LessonServiceException; + void updateLearners(Lesson lesson, Collection users) throws LessonServiceException; /** * Add a new staff member to the lesson class. Checks for duplicates. @@ -294,7 +294,7 @@ * @param users * the users to set as staff */ - void setStaffMembers(Lesson lesson, Collection users) throws LessonServiceException; + void updateStaffMembers(Lesson lesson, Collection users) throws LessonServiceException; /** * Remove references to an activity from all learner progress entries. Used by Live Edit, to remove any references Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java,v diff -u -r1.48.2.7 -r1.48.2.8 --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 23 Nov 2015 11:49:54 -0000 1.48.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 24 Nov 2015 14:30:57 -0000 1.48.2.8 @@ -384,7 +384,7 @@ } @Override - public void setLearners(Lesson lesson, Collection users) throws LessonServiceException { + public void updateLearners(Lesson lesson, Collection users) throws LessonServiceException { LessonClass lessonClass = lesson.getLessonClass(); int numberOfLearners = lessonClass.setLearners(users); lessonClassDAO.updateLessonClass(lessonClass); @@ -461,8 +461,7 @@ } @Override - public void setStaffMembers(Lesson lesson, Collection users) throws LessonServiceException { - + public void updateStaffMembers(Lesson lesson, Collection users) throws LessonServiceException { LessonClass lessonClass = lesson.getLessonClass(); int numberOfStaff = lessonClass.setStaffMembers(users); lessonClassDAO.updateLessonClass(lessonClass); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.195.2.18 -r1.195.2.19 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 23 Nov 2015 11:49:32 -0000 1.195.2.18 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 24 Nov 2015 14:30:56 -0000 1.195.2.19 @@ -538,8 +538,8 @@ // if lesson isn't started recreate the lesson class if (newLesson.isLessonStarted()) { securityService.isLessonMonitor(lessonId, userId, "create class for lesson", true); - lessonService.setLearners(newLesson, organizationUsers); - lessonService.setStaffMembers(newLesson, staffs); + lessonService.updateLearners(newLesson, organizationUsers); + lessonService.updateStaffMembers(newLesson, staffs); } else { if (organisation != null) { // security check needs organisation to be set Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.118.2.25 -r1.118.2.26 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 11 Nov 2015 14:50:11 -0000 1.118.2.25 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 24 Nov 2015 14:30:56 -0000 1.118.2.26 @@ -806,10 +806,10 @@ } List learners = parseUserList(request, "learners", allUsers); - getLessonService().setLearners(lesson, learners); + getLessonService().updateLearners(lesson, learners); List staff = parseUserList(request, "monitors", allUsers); - getLessonService().setStaffMembers(lesson, staff); + getLessonService().updateStaffMembers(lesson, staff); return null; }