Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r6045ddb0d3684dda87e8a0fa99dc5320937387a8 -r59dfe94a20dc4a7ba76c5722aa6536f995d22960 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6045ddb0d3684dda87e8a0fa99dc5320937387a8) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 59dfe94a20dc4a7ba76c5722aa6536f995d22960) @@ -895,4 +895,10 @@ authoring.application.exercise.allow.multiple.responses.tooltip =When learners are allowed to select multiple answers the grade is the sum of the grade for all correct responses selected. message.teacher.role.not.recognized =Please wait for a teacher to start the lesson. (You were logged in as a learner, as your current role does not conform LTI specification). +label.multiple.lessons =Multiple lessons +label.add.lessons.to.subgroups =Add lessons to all these subgroups +label. +label. +label. + #======= End labels: Exported 872 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java =================================================================== diff -u -r1df79e8f3202227e5d076d5823aa74c58c48504c -r59dfe94a20dc4a7ba76c5722aa6536f995d22960 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 1df79e8f3202227e5d076d5823aa74c58c48504c) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 59dfe94a20dc4a7ba76c5722aa6536f995d22960) @@ -68,6 +68,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.context.WebApplicationContext; @@ -249,9 +250,8 @@ @RequestMapping("/addLesson") @SuppressWarnings("unchecked") - public String addLesson(HttpServletRequest req, HttpServletResponse res) + public String addLesson(HttpServletRequest req, HttpServletResponse res, @RequestParam Integer organisationID) throws IOException, UserAccessDeniedException, RepositoryCheckedException { - Integer organisationID = new Integer(WebUtil.readIntParam(req, "organisationID")); UserDTO userDTO = getUser(); if (!securityService.isGroupMonitor(organisationID, userDTO.getUserID(), "add lesson", false)) { res.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation"); @@ -290,7 +290,6 @@ users.withArray("unselectedMonitors").add(userJSON); } } - req.setAttribute("users", users.toString()); // find lessons which can be set as preceding ones for newly created lesson @@ -304,6 +303,9 @@ } } req.setAttribute("availablePrecedingLessons", availableLessons); + + // find subgroups which can be set as multiple lessons start + req.setAttribute("subgroups", organisation.getChildOrganisations()); return "addLesson"; }