Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r2e5d858e9dd95ddc9aa092c307b2039c9cb62930 -reb8cf79579303048eefce860e543f36186d3ce10
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -reb8cf79579303048eefce860e543f36186d3ce10
--- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml (.../lessonApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml (.../lessonApplicationContext.xml) (revision eb8cf79579303048eefce860e543f36186d3ce10)
@@ -47,6 +47,7 @@
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
+ PROPAGATION_REQUIRED
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
===================================================================
diff -u -r2e5d858e9dd95ddc9aa092c307b2039c9cb62930 -reb8cf79579303048eefce860e543f36186d3ce10
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java (.../ILessonService.java) (revision 2e5d858e9dd95ddc9aa092c307b2039c9cb62930)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java (.../ILessonService.java) (revision eb8cf79579303048eefce860e543f36186d3ce10)
@@ -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
===================================================================
diff -u -r2e5d858e9dd95ddc9aa092c307b2039c9cb62930 -reb8cf79579303048eefce860e543f36186d3ce10
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 2e5d858e9dd95ddc9aa092c307b2039c9cb62930)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision eb8cf79579303048eefce860e543f36186d3ce10)
@@ -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
===================================================================
diff -u -r2e5d858e9dd95ddc9aa092c307b2039c9cb62930 -reb8cf79579303048eefce860e543f36186d3ce10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 2e5d858e9dd95ddc9aa092c307b2039c9cb62930)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision eb8cf79579303048eefce860e543f36186d3ce10)
@@ -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
===================================================================
diff -u -r2f67a20e73128f03e7b4221ca09426c14bef2abf -reb8cf79579303048eefce860e543f36186d3ce10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 2f67a20e73128f03e7b4221ca09426c14bef2abf)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision eb8cf79579303048eefce860e543f36186d3ce10)
@@ -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;
}