Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -71,13 +71,14 @@ @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request, HttpServletResponse response) throws IOException { + if (!getSecurityService().isSysadmin(getUserID(), "display cleanup preview lessons", false)) { response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); return null; } if (!(request.isUserInRole(Role.SYSADMIN))) { - request.setAttribute("errorName", "CleanupPreviewLessonsAction"); + request.setAttribute("errorName", "CleanupPreviewLessonsController"); request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.sysadmin")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -39,7 +39,6 @@ import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -65,8 +64,7 @@ private MessageService adminMessageService; @RequestMapping(path = "/start") - public String execute(@ModelAttribute CleanupForm cleanupForm, Errors errors, HttpServletRequest request) - throws Exception { + public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception { // check user is sysadmin if (!(request.isUserInRole(Role.SYSADMIN))) { @@ -75,10 +73,6 @@ return "error"; } - if (request.getAttribute("CANCEL") != null) { - return "forward:/sysadminstart.do"; - } - // check if url contains request for refresh folder sizes only String action = WebUtil.readStrParam(request, "action", true); if (action != null && StringUtils.equals(action, "refresh")) { @@ -96,13 +90,13 @@ args[0] = new Integer(filesDeleted).toString(); request.setAttribute("filesDeleted", adminMessageService.getMessage("msg.cleanup.files.deleted", args)); } else { - errors.reject("numDays", adminMessageService.getMessage("error.non.negative.number.required")); + errorMap.add("numDays", adminMessageService.getMessage("error.non.negative.number.required")); } } else { // recommended number of days to leave temp files cleanupForm.setNumDays(1); } - + request.setAttribute("errorMap", errorMap); return "cleanup"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -74,7 +74,7 @@ @Autowired private WebApplicationContext applicationContext; - @RequestMapping(path = "/start", method = RequestMethod.POST) + @RequestMapping(path = "/start") public String execute(HttpServletRequest request, HttpServletResponse response) throws UserAccessDeniedException { if (!(request.isUserInRole(Role.SYSADMIN))) { @@ -88,7 +88,7 @@ String method = WebUtil.readStrParam(request, "method", true); if (StringUtils.equals(method, "getGroups")) { - return getGroups(request, response); + return getGroups(response); } else if (StringUtils.equals(method, "getSubgroups")) { return getSubgroups(request, response); } else if (StringUtils.equals(method, "availableLessons")) { @@ -116,7 +116,7 @@ // ajax @RequestMapping("/getGroups") @ResponseBody - public String getGroups(HttpServletRequest request, HttpServletResponse response) throws Exception { + public String getGroups(HttpServletResponse response) throws Exception { response.addHeader("Cache-Control", "no-cache"); response.addHeader("content-type", "text/html; charset=UTF-8"); @@ -161,7 +161,7 @@ } // ajax - @RequestMapping(path = "/availableLessons", method = RequestMethod.POST) + @RequestMapping(path = "/availableLessons") public String availableLessons(HttpServletRequest request, HttpServletResponse response) throws Exception { Integer sourceGroupId = WebUtil.readIntParam(request, "sourceGroupId", true); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -81,7 +81,7 @@ public String save(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } String[] keys = configForm.getKey(); @@ -122,7 +122,7 @@ Configuration.refreshCache(); - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } private String getRequiredError(String arg) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -68,7 +68,7 @@ // validation if (file == null || file.getSize() <= 0) { - return "forward:/importexcel.do"; + return "redirect:/importexcel.do"; } String sessionId = SessionManager.getSession().getId(); @@ -77,7 +77,7 @@ if (importService.getNumRows(file) < IImportService.THRESHOLD) { List results = importService.parseSpreadsheet(file, sessionId); SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results); - return "forward:/importuserresult.do"; + return "redirect:/importuserresult.do"; } else { Thread t = new Thread(new ImportExcelThread(sessionId)); t.start(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -56,7 +56,7 @@ HttpServletResponse response) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } BufferedWriter bWriter = null; @@ -73,7 +73,7 @@ } } - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -133,34 +133,57 @@ MultiValueMap errorMap = new LinkedMultiValueMap<>(); - String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" }; - for (String requiredField : requiredFields) { - if (StringUtils.trimToNull(ltiConsumerForm.getRequiredField()) == null) { - errorMap.add(requiredField, messageService.getMessage("error.required")); - } + if (StringUtils.trimToNull(ltiConsumerForm.getServerid()) == null) { + errorMap.add("serverid", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.serverid") })); } + if (StringUtils.trimToNull(ltiConsumerForm.getServerkey()) == null) { + errorMap.add("serverkey", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.serverkey") })); + } + if (StringUtils.trimToNull(ltiConsumerForm.getServername()) == null) { + errorMap.add("servername", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.servername") })); + } + if (StringUtils.trimToNull(ltiConsumerForm.getPrefix()) == null) { + errorMap.add("prefix", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } Integer sid = ltiConsumerForm.getSid(); //check duplication if (errorMap.isEmpty()) { - String[] uniqueFields = { "serverid", "prefix" }; - for (String uniqueField : uniqueFields) { - List list = userManagementService.findByProperty(ExtServer.class, uniqueField, ltiConsumerForm.getUniqueField()); - if (list != null && list.size() > 0) { - if (sid.equals(0)) {//new map - errorMap.add(uniqueField, - messageService.getMessage("error.not.unique")); - } else { - ExtServer ltiConsumer = list.get(0); - if (!ltiConsumer.getSid().equals(sid)) { - errorMap.add(uniqueField, - messageService.getMessage("error.not.unique")); - } + List listServer = userManagementService.findByProperty(ExtServer.class, "serverid", + ltiConsumerForm.getServerid()); + if (listServer != null && listServer.size() > 0) { + if (sid.equals(0)) {//new map + errorMap.add("serverid", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.serverid") })); + } else { + ExtServer ltiConsumer = listServer.get(0); + if (!ltiConsumer.getSid().equals(sid)) { + errorMap.add("serverid", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.serverid") })); } + } + } + List listPrefix = userManagementService.findByProperty(ExtServer.class, "prefix", + ltiConsumerForm.getPrefix()); + if (listPrefix != null && listPrefix.size() > 0) { + if (sid.equals(0)) {//new map + errorMap.add("prefix", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } else { + ExtServer ltiConsumer = listPrefix.get(0); + if (!ltiConsumer.getSid().equals(sid)) { + errorMap.add("prefix", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } } } } + if (errorMap.isEmpty()) { ExtServer ltiConsumer = null; if (sid.equals(0)) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -132,7 +132,7 @@ writeAuditLog(user, org, organisationForm, state, locale); BeanUtils.copyProperties(org, organisationForm); } else { - request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -153,9 +153,10 @@ org = service.saveOrganisation(org, user.getUserID()); request.setAttribute("org", organisationForm.getParentId()); - return "forward:/orgmanage.do"; + return "redirect:/orgmanage.do"; } else { - return "forward:/organisation/edit.do"; + request.setAttribute("errorMap", errorMap); + return "redirect:/organisation/edit.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -128,8 +128,8 @@ } @RequestMapping(path = "/create") - public String create(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request, - HttpServletResponse response) throws Exception { + public String create(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request) + throws Exception { OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); initLocalesAndStatus(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -70,7 +70,7 @@ ExtServer map = service.getExtServer(sid); map.setDisabled(true); service.saveExtServer(map); - return "forward:/serverlist.do"; + return "redirect:/serverlist.do"; } @RequestMapping(path = "/enable") @@ -80,14 +80,14 @@ ExtServer map = service.getExtServer(sid); map.setDisabled(false); service.saveExtServer(map); - return "forward:/serverlist.do"; + return "redirect:/serverlist.do"; } @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", false); AdminServiceProxy.getService(applicationContext.getServletContext()).deleteById(ExtServer.class, sid); - return "forward:/serverlist.do"; + return "redirect:/serverlist.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -71,33 +71,60 @@ MultiValueMap errorMap = new LinkedMultiValueMap<>(); - String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" }; - for (String requiredField : requiredFields) { - request.setAttribute("requiredField", requiredField); - if (StringUtils.trimToNull(extServerForm.getRequiredField()) == null) { - errorMap.add(requiredField, messageService.getMessage("error.required")); - } + if (StringUtils.trimToNull(extServerForm.getServerid()) == null) { + errorMap.add("serverid", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.serverid") })); } - + if (StringUtils.trimToNull(extServerForm.getServerkey()) == null) { + errorMap.add("serverkey", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.serverkey") })); + } + if (StringUtils.trimToNull(extServerForm.getServername()) == null) { + errorMap.add("servername", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.servername") })); + } + if (StringUtils.trimToNull(extServerForm.getPrefix()) == null) { + errorMap.add("prefix", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } + if (StringUtils.trimToNull(extServerForm.getPrefix()) == null) { + errorMap.add("userinfoUrl", messageService.getMessage("error.required", + new Object[] { messageService.getMessage("sysadmin.userinfoUrl") })); + } + Integer sid = extServerForm.getSid(); if (errorMap.isEmpty()) {//check duplication - String[] uniqueFields = { "serverid", "prefix" }; - for (String uniqueField : uniqueFields) { - List list = userService.findByProperty(ExtServer.class, uniqueField, extServerForm.getUniqueField()); - if (list != null && list.size() > 0) { - request.setAttribute("uniqueField", uniqueField); - if (sid.equals(-1)) {//new map - errorMap.add(uniqueField, messageService.getMessage("error.not.unique")); - } else { - ExtServer map = (ExtServer) list.get(0); - if (!map.getSid().equals(sid)) { - errorMap.add(uniqueField, messageService.getMessage("error.not.unique")); - } + List listServer = userService.findByProperty(ExtServer.class, "serverid", + extServerForm.getServerid()); + if (listServer != null && listServer.size() > 0) { + if (sid.equals(-1)) {//new map + errorMap.add("serverid", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.serverid") })); + } else { + ExtServer map = (ExtServer) listServer.get(0); + if (!map.getSid().equals(sid)) { + errorMap.add("serverid", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.serverid") })); } + } + } + List listPrefix = userService.findByProperty(ExtServer.class, "prefix", + extServerForm.getPrefix()); + if (listPrefix != null && listPrefix.size() > 0) { + if (sid.equals(0)) {//new map + errorMap.add("prefix", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } else { + ExtServer map = (ExtServer) listServer.get(0); + if (!map.getSid().equals(sid)) { + errorMap.add("prefix", messageService.getMessage("error.not.unique", + new Object[] { messageService.getMessage("sysadmin.prefix") })); + } } } } + if (errorMap.isEmpty()) { ExtServer map = null; if (sid.equals(-1)) { @@ -110,7 +137,7 @@ BeanUtils.copyProperties(map, extServerForm); } service.saveExtServer(map); - return "forward:/serverlist.do"; + return "redirect:/serverlist.do"; } else { request.setAttribute("errorMap", errorMap); return "servermaintain"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -93,7 +93,7 @@ HttpServletResponse response) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } String[] selectedTimezoneIds = timezoneForm.getSelected(); @@ -104,7 +104,7 @@ } timezoneService.updateTimezones(selectedTimezones); - return "forward:/sysadminstart.do"; + return "redirect:/sysadminstart.do"; } /** Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -206,15 +206,15 @@ Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); ILearningDesignService ldService = getLearningDesignService(); ldService.setValid(learningLibraryId, false); - return "forward:/toolcontentlist/start.do"; + return "redirect:/toolcontentlist/start.do"; } @RequestMapping("/enable") public String enableLibrary(HttpServletRequest request) { Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); ILearningDesignService ldService = getLearningDesignService(); ldService.setValid(learningLibraryId, true); - return "forward:/toolcontentlist/start.do"; + return "redirect:/toolcontentlist/start.do"; } /** @@ -263,12 +263,12 @@ for (JsonNode groupJSON : groupsJSON) { LearningLibraryGroup group = new LearningLibraryGroup(); groups.add(group); - - long groupId = groupJSON.get("groupId").asLong(); - if (groupId > 0) { + + Long groupId = JsonUtil.optLong(groupJSON, "groupId"); + if (groupId != null) { group.setGroupId(groupId); } - group.setName(groupJSON.get("name").asText(null)); + group.setName(JsonUtil.optString(groupJSON, "name")); group.setLearningLibraries(new HashSet()); ArrayNode learningLibrariesJSON = (ArrayNode) groupJSON.get("learningLibraries"); @@ -281,7 +281,7 @@ getLearningDesignService().saveLearningLibraryGroups(groups); - return "forward:/toolcontentlist/start.do"; + return "redirect:/toolcontentlist/start.do"; } private ILearningDesignService getLearningDesignService() { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -335,10 +335,10 @@ logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { - return "forward:../usersearch.do"; + return "redirect:../usersearch.do"; } else { request.setAttribute("org", orgId); - return "forward:../usermanage.do"; + return "redirect:../usermanage.do"; } } @@ -370,10 +370,10 @@ logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { - return "forward:../usersearch.do"; + return "redirect:../usersearch.do"; } else { request.setAttribute("org", orgId); - return "forward:../usermanage.do"; + return "redirect:../usermanage.do"; } } @@ -396,7 +396,7 @@ user.setDisabledFlag(false); service.saveUser(user); - return "forward:../disabledmanage.do"; + return "redirect:../disabledmanage.do"; } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -93,7 +93,7 @@ request.getSession().removeAttribute("UserOrgRoleForm"); if (request.getAttribute("CANCEL") != null) { - return "forward:/usermanage.do"; + return "redirect:/usermanage.do"; } // save UserOrganisation memberships, and the associated roles; @@ -109,7 +109,7 @@ errorMap.add("roles", adminMessageService.getMessage("error.roles.empty")); request.setAttribute("errorMap", errorMap); request.setAttribute("orgId", orgId); - return "forward:/userorg.do"; + return "redirect:/userorg.do"; } service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds)); // FMALIKOFF 5/7/7 Commented out the following code that set the roles in the course if the current org is a class, as the logic @@ -120,7 +120,7 @@ // } //} } - return "forward:/usermanage.do"; + return "redirect:/usermanage.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -131,13 +131,13 @@ // if no new users, then finish; otherwise forward to where roles can be assigned for new users. if (newUserOrganisations.isEmpty()) { log.debug("no new users to add to orgId=" + orgId); - return "forward:/usermanage.do"; + return "redirect:/usermanage.do"; } else { request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), organisation.getOrganisationType())); request.setAttribute("newUserOrganisations", newUserOrganisations); request.setAttribute("orgId", orgId); - return "forward:/userorgrole.do"; + return "redirect:/userorgrole.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -88,10 +88,6 @@ request.setAttribute("org", orgId); - if (request.getAttribute("CANCEL") != null) { - return "forward:/usermanage.do"; - } - log.debug("userId: " + userId + ", orgId: " + orgId + " will have " + roles.length + " roles"); Organisation org = (Organisation) service.findById(Organisation.class, orgId); User user = (User) service.findById(User.class, userId); @@ -103,12 +99,12 @@ service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), org.getOrganisationType())); request.setAttribute("login", user.getLogin()); request.setAttribute("fullName", user.getFullName()); - return "forward:/userroles.do"; + return "redirect:/userroles.do"; } service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles)); - return "forward:/usermanage.do"; + return "redirect:/usermanage.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -112,10 +112,10 @@ if (request.getAttribute("CANCEL") != null) { if ((orgId == null) || (orgId == 0)) { - return "forward:../usersearch.do"; + return "redirect:../usersearch.do"; } request.setAttribute("org", orgId); - return "forward:../usermanage.do"; + return "redirect:../usermanage.do"; } User user = null; @@ -232,15 +232,15 @@ if (errorMap.isEmpty()) { if ((orgId == null) || (orgId == 0)) { - return "forward:../usersearch.do"; + return "redirect:../usersearch.do"; } if (edit) { request.setAttribute("org", orgId); - return "forward:../usermanage.do"; + return "redirect:../usermanage.do"; } else { request.setAttribute("orgId", orgId); request.setAttribute("userId", user.getUserId()); - return "forward:../userroles.do"; + return "redirect:../userroles.do"; } } else { request.setAttribute("orgId", orgId); @@ -287,7 +287,7 @@ user.setSalt(salt); user.setPassword(passwordHash); UserSaveController.service.saveUser(user); - return "forward:../user/edit.do"; + return "redirect:../user/edit.do"; } request.setAttribute("errorMap", errorMap); return "userChangePass"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ConfigForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ConfigForm.java (.../ConfigForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ConfigForm.java (.../ConfigForm.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -28,8 +28,6 @@ private String[] value; - private String method; - public String[] getKey() { return key; } @@ -46,12 +44,4 @@ this.value = value; } - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java (.../ExtServerForm.java) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java (.../ExtServerForm.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -48,10 +48,6 @@ private Integer timeToLiveLoginRequest = 80; - private String requiredField; - - private String uniqueField; - public Integer getSid() { return sid; } @@ -148,20 +144,4 @@ this.timeToLiveLoginRequest = timeToLiveLoginRequest; } - public String getRequiredField() { - return requiredField; - } - - public void setRequiredField(String requiredField) { - this.requiredField = requiredField; - } - - public String getUniqueField() { - return uniqueField; - } - - public void setUniqueField(String uniqueField) { - this.uniqueField = uniqueField; - } - } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java (.../LtiConsumerForm.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java (.../LtiConsumerForm.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -44,10 +44,6 @@ private String ltiToolConsumerMonitorRoles; - private String requiredField; - - private String uniqueField; - public Integer getSid() { return sid; } @@ -128,20 +124,4 @@ this.ltiToolConsumerMonitorRoles = ltiToolConsumerMonitorRoles; } - public String getRequiredField() { - return requiredField; - } - - public void setRequiredField(String requiredField) { - this.requiredField = requiredField; - } - - public String getUniqueField() { - return uniqueField; - } - - public void setUniqueField(String uniqueField) { - this.uniqueField = uniqueField; - } - } Index: lams_admin/web/cleanup.jsp =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -23,7 +23,7 @@

<%-- Error Messages --%> - + Index: lams_admin/web/cleanupPreviewLessons.jsp =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 --- lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) @@ -77,15 +77,6 @@

- - - - - - - - -  ${previewCount} / ${allLessonCount}