Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -76,7 +76,7 @@ } if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } // check if url contains request for refresh folder sizes only Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -81,7 +81,7 @@ public String save(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } String[] keys = configForm.getKey(); @@ -122,7 +122,7 @@ Configuration.refreshCache(); - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } private String getRequiredError(String arg) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -68,7 +68,7 @@ // validation if (file == null || file.getSize() <= 0) { - return "redirect:/importexcel.do"; + return "forward:/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 "redirect:/importuserresult.do"; + return "forward:/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 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -56,7 +56,7 @@ HttpServletResponse response) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } BufferedWriter bWriter = null; @@ -73,7 +73,7 @@ } } - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -185,8 +185,8 @@ Boolean email = orgPasswordChangeForm.isEmail(); Boolean force = orgPasswordChangeForm.isForce(); - Boolean isStaffChange = orgPasswordChangeForm.isStaffChange(); - Boolean isLearnerChange = orgPasswordChangeForm.isLearnerChange(); + Boolean isStaffChange = orgPasswordChangeForm.getIsStaffChange(); + Boolean isLearnerChange = orgPasswordChangeForm.getIsLearnerChange(); // get data needed for each group if (isStaffChange) { String staffString = orgPasswordChangeForm.getExcludedStaff(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -91,8 +91,8 @@ @Autowired private WebApplicationContext applicationContext; - @RequestMapping(path = "/orgsave", method = RequestMethod.POST) - public String execute(@ModelAttribute OrganisationForm organisationForm, Errors errors, HttpServletRequest request, + @RequestMapping(path = "/orgsave") + public String execute(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request, HttpServletResponse response) throws Exception { if (service == null) { @@ -105,29 +105,16 @@ Integer orgId = organisationForm.getOrgId(); Organisation org; - if (request.getAttribute("CANCEL") != null) { - if (orgId != 0) { - request.setAttribute("org", orgId); - org = (Organisation) service.findById(Organisation.class, orgId); - if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { - return "redirect:/usermanage.do"; - } - } else { - request.setAttribute("org", organisationForm.getParentId()); - } - return "redirect:../orgmanage.do"; - } - - + MultiValueMap errorMap = new LinkedMultiValueMap<>(); //organisation name validation String orgName = (organisationForm.getName() == null) ? null : organisationForm.getName(); if (StringUtils.isBlank(orgName)) { - errors.reject("name", messageService.getMessage("error.name.required")); + errorMap.add("name", messageService.getMessage("error.name.required")); } else if (!ValidationUtil.isOrgNameValid(orgName)) { - errors.reject("name", messageService.getMessage("error.name.invalid.characters")); + errorMap.add("name", messageService.getMessage("error.name.invalid.characters")); } - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); SupportedLocale locale = (SupportedLocale) service.findById(SupportedLocale.class, @@ -167,9 +154,9 @@ org = service.saveOrganisation(org, user.getUserID()); request.setAttribute("org", organisationForm.getParentId()); - return "redirect:/orgmanage.do"; + return "forward:/orgmanage.do"; } else { - return "redirect:/organisation/edit.do"; + return "forward:/organisation/edit.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -70,7 +70,7 @@ ExtServer map = service.getExtServer(sid); map.setDisabled(true); service.saveExtServer(map); - return "redirect:/serverlist.do"; + return "forward:/serverlist.do"; } @RequestMapping(path = "/enable") @@ -80,14 +80,14 @@ ExtServer map = service.getExtServer(sid); map.setDisabled(false); service.saveExtServer(map); - return "redirect:/serverlist.do"; + return "forward:/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 "redirect:/serverlist.do"; + return "forward:/serverlist.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -106,7 +106,7 @@ BeanUtils.copyProperties(map, extServerForm); } service.saveExtServer(map); - return "redirect:/serverlist.do"; + return "forward:/serverlist.do"; } else { return "servermaintain"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -156,7 +156,7 @@ signup.setContext(signupForm.getContext()); userManagementService.save(signup); - return "redirect:../signupManagement/start.do"; + return "forward:../signupManagement/start.do"; } } else { // form not submitted, default values @@ -178,6 +178,6 @@ userManagementService.deleteById(SignupOrganisation.class, soid); } - return "redirect:../signupManagement/start.do"; + return "forward:../signupManagement/start.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -93,7 +93,7 @@ HttpServletResponse response) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } String[] selectedTimezoneIds = timezoneForm.getSelected(); @@ -104,7 +104,7 @@ } timezoneService.updateTimezones(selectedTimezones); - return "redirect:/sysadminstart.do"; + return "forward:/sysadminstart.do"; } /** Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -248,7 +248,7 @@ } request.setAttribute("groups", groupsJSON.toString()); - return "toolcontent/learningLibraryGroup"; + return "forward:/toolcontent/learningLibraryGroup"; } @RequestMapping("/saveLearningLibraryGroups") Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -149,7 +149,7 @@ } if (!(canEdit || request.isUserInRole(Role.SYSADMIN))) { - request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -319,7 +319,7 @@ initServices(); if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { - request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -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 "redirect:../usersearch.do"; + return "forward:../usersearch.do"; } else { request.setAttribute("org", orgId); - return "redirect:../usermanage.do"; + return "forward:../usermanage.do"; } } @@ -359,7 +359,7 @@ try { service.removeUser(userId); } catch (Exception e) { - request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", e.getMessage()); return "error"; } @@ -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 "redirect:../usersearch.do"; + return "forward:../usersearch.do"; } else { request.setAttribute("org", orgId); - return "redirect:../usermanage.do"; + return "forward:../usermanage.do"; } } @@ -384,7 +384,7 @@ initServices(); if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { - request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -396,7 +396,7 @@ user.setDisabledFlag(false); service.saveUser(user); - return "redirect:../disabledmanage.do"; + return "forward:../disabledmanage.do"; } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -93,7 +93,7 @@ request.getSession().removeAttribute("UserOrgRoleForm"); if (request.getAttribute("CANCEL") != null) { - return "redirect:/usermanage.do"; + return "forward:/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 "redirect:/userorg.do"; + return "forward:/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 "redirect:/usermanage.do"; + return "forward:/usermanage.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -77,10 +77,6 @@ Integer orgId = userOrgForm.getOrgId(); request.setAttribute("org", orgId); - if (request.getAttribute("CANCEL") != null) { - return "redirect:/usermanage.do"; - } - service = AdminServiceProxy.getService(applicationContext.getServletContext()); if (rolelist == null) { rolelist = service.findAll(Role.class); @@ -135,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 "redirect:/usermanage.do"; + return "forward:/usermanage.do"; } else { request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), organisation.getOrganisationType())); request.setAttribute("newUserOrganisations", newUserOrganisations); request.setAttribute("orgId", orgId); - return "redirect:/userorgrole.do"; + return "forward:/userorgrole.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java =================================================================== diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -124,7 +124,7 @@ || (service.isUserGlobalGroupAdmin() && !rootOrgId.equals(orgId)); if (!(requestorHasRole || isSysadmin)) { - request.setAttribute("errorName", "UserRolesAction"); + request.setAttribute("errorName", "UserRolesController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java =================================================================== diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision d4dec47dab74477560cfee18e74c7e4494bd1426) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -89,7 +89,7 @@ request.setAttribute("org", orgId); if (request.getAttribute("CANCEL") != null) { - return "redirect:/usermanage.do"; + return "forward:/usermanage.do"; } log.debug("userId: " + userId + ", orgId: " + orgId + " will have " + roles.length + " roles"); @@ -108,7 +108,7 @@ service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles)); - return "redirect:/usermanage.do"; + return "forward:/usermanage.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -50,7 +50,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; import org.springframework.web.bind.annotation.RequestMethod; @@ -84,7 +83,7 @@ private WebApplicationContext applicationContext; @RequestMapping(path = "/saveUserDetails", method = RequestMethod.POST) - public String saveUserDetails(@ModelAttribute UserForm userForm, Errors errors, HttpServletRequest request, + public String saveUserDetails(@ModelAttribute UserForm userForm, HttpServletRequest request, HttpServletResponse response) throws Exception { messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); @@ -113,10 +112,10 @@ if (request.getAttribute("CANCEL") != null) { if ((orgId == null) || (orgId == 0)) { - return "redirect:/usersearch.do"; + return "forward:../usersearch.do"; } request.setAttribute("org", orgId); - return "redirect:/usermanage.do"; + return "forward:../usermanage.do"; } User user = null; @@ -125,20 +124,21 @@ user = (User) UserSaveController.service.findById(User.class, userId); } + MultiValueMap errorMap = new LinkedMultiValueMap<>(); // login validation String login = userForm.getLogin() == null ? null : userForm.getLogin().trim(); if (StringUtils.isBlank(login)) { - errors.reject("login", messageService.getMessage("error.login.required")); + errorMap.add("login", messageService.getMessage("error.login.required")); } else if (!ValidationUtil.isUserNameValid(login)) { - errors.reject("login", messageService.getMessage("error.username.invalid.characters")); + errorMap.add("login", messageService.getMessage("error.username.invalid.characters")); } else { userForm.setLogin(login); User existingUser = UserSaveController.service.getUserByLogin(login); if (existingUser != null) { if ((user != null) && StringUtils.equals(user.getLogin(), login)) { // login exists - it's the user's current login } else { - errors.reject("login", messageService.getMessage("error.login.unique", + errorMap.add("login", messageService.getMessage("error.login.unique", "(" + login + ", ID: " + existingUser.getUserId() + ")")); } } @@ -147,28 +147,28 @@ //first name validation String firstName = (userForm.getFirstName() == null) ? null : userForm.getFirstName(); if (StringUtils.isBlank(firstName)) { - errors.reject("firstName", messageService.getMessage("error.firstname.required")); + errorMap.add("firstName", messageService.getMessage("error.firstname.required")); } else if (!ValidationUtil.isFirstLastNameValid(firstName)) { - errors.reject("firstName", messageService.getMessage("error.firstname.invalid.characters")); + errorMap.add("firstName", messageService.getMessage("error.firstname.invalid.characters")); } //last name validation String lastName = (userForm.getLastName() == null) ? null : userForm.getLastName(); if (StringUtils.isBlank(lastName)) { - errors.reject("lastName", messageService.getMessage("error.lastname.required")); + errorMap.add("lastName", messageService.getMessage("error.lastname.required")); } else if (!ValidationUtil.isFirstLastNameValid(lastName)) { - errors.reject("lastName", messageService.getMessage("error.lastname.invalid.characters")); + errorMap.add("lastName", messageService.getMessage("error.lastname.invalid.characters")); } //user email validation String userEmail = (userForm.getEmail() == null) ? null : userForm.getEmail(); if (StringUtils.isBlank(userEmail)) { - errors.reject("email", messageService.getMessage("error.email.required")); + errorMap.add("email", messageService.getMessage("error.email.required")); } else if (!ValidationUtil.isEmailValid(userEmail)) { - errors.reject("email", messageService.getMessage("error.valid.email.required")); + errorMap.add("email", messageService.getMessage("error.valid.email.required")); } - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { if (edit) { // edit user UserSaveController.log.debug("editing userId: " + userId); // hash the new password if necessary, and audit the fact @@ -187,24 +187,24 @@ String password2 = userForm.getPassword2(); String password = (userForm.getPassword() == null) ? null : userForm.getPassword(); if (StringUtils.isBlank(password)) { - errors.reject("password", messageService.getMessage("error.password.required")); + errorMap.add("password", messageService.getMessage("error.password.required")); } if (!StringUtils.equals(password, (userForm.getPassword2()))) { - errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); + errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); } if (!ValidationUtil.isPasswordValueValid(password, password2)) { - errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); + errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); } - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { user = new User(); String salt = HashUtil.salt(); String passwordHash = HashUtil.sha256(userForm.getPassword(), salt); BeanUtils.copyProperties(user, userForm); user.setSalt(salt); user.setPassword(passwordHash); UserSaveController.log.debug("creating user... new login: " + user.getLogin()); - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { // TODO set theme according to user input // instead of server default. user.setTheme(UserSaveController.service.getDefaultTheme()); @@ -230,26 +230,28 @@ } } - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { if ((orgId == null) || (orgId == 0)) { - return "redirect:/usersearch.do"; + return "forward:../usersearch.do"; } if (edit) { request.setAttribute("org", orgId); - return "redirect:/usermanage.do"; + return "forward:../usermanage.do"; } else { request.setAttribute("orgId", orgId); request.setAttribute("userId", user.getUserId()); - return "redirect:/userroles.do"; + return "forward:../userroles.do"; } } else { request.setAttribute("orgId", orgId); - return "redirect:/user/edit.do"; + request.setAttribute("errorMap", errorMap); + return "forward:../user/edit.do"; } } @RequestMapping(path = "/changePass") - public String changePass(HttpServletRequest request, Errors errors, HttpServletResponse response) throws Exception { + public String changePass(@ModelAttribute UserForm userForm, HttpServletRequest request, + HttpServletResponse response) throws Exception { UserSaveController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); Integer userId = WebUtil.readIntParam(request, "userId", true); @@ -265,27 +267,29 @@ String password = WebUtil.readStrParam(request, "password"); String password2 = WebUtil.readStrParam(request, "password2"); + MultiValueMap errorMap = new LinkedMultiValueMap<>(); //password validation if (StringUtils.isBlank(password)) { - errors.reject("password", messageService.getMessage("error.password.required")); + errorMap.add("password", messageService.getMessage("error.password.required")); } if (!StringUtils.equals(password, password2)) { - errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); + errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); } if (!ValidationUtil.isPasswordValueValid(password, password2)) { - errors.reject("password", messageService.getMessage("label.password.restrictions")); + errorMap.add("password", messageService.getMessage("label.password.restrictions")); } - if (!errors.hasErrors()) { + if (errorMap.isEmpty()) { User user = (User) UserSaveController.service.findById(User.class, userId); String salt = HashUtil.salt(); String passwordHash = HashUtil.sha256(password, salt); user.setSalt(salt); user.setPassword(passwordHash); UserSaveController.service.saveUser(user); - return "redirect:/user/edit.do"; + return "forward:../user/edit.do"; } + request.setAttribute("errorMap", errorMap); return "userChangePass"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java (.../OrgPasswordChangeForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java (.../OrgPasswordChangeForm.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -64,15 +64,15 @@ this.orgName = orgName; } - public boolean isStaffChange() { + public boolean getIsStaffChange() { return isStaffChange; } public void setStaffChange(boolean isStaffChange) { this.isStaffChange = isStaffChange; } - public boolean isLearnerChange() { + public boolean getIsLearnerChange() { return isLearnerChange; } Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -5,15 +5,17 @@ <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> <%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> -<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> -<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> +<%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> +<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + Index: lams_admin/web/import/importresult.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/web/import/importresult.jsp (.../importresult.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/import/importresult.jsp (.../importresult.jsp) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -18,7 +18,7 @@

-

+

Index: lams_admin/web/orgPasswordChange.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -124,8 +124,7 @@ return; } $.ajax({ - 'url' : 'orgPasswordChange/generatePassword.do' - } + 'url' : '../orgPasswordChange/generatePassword.do' }).done(function(password){ container.find('.pass').val(password); }); @@ -190,7 +189,7 @@ } }); - var jqGridURL = "orgPasswordChange/getGridUsers.do?organisationID=&role=", + var jqGridURL = "../orgPasswordChange/getGridUsers.do?organisationID=&role=", jqGridSettings = { datatype : "json", height : "100%", @@ -378,7 +377,7 @@ - + @@ -419,7 +418,7 @@ - @@ -430,7 +429,7 @@ - Index: lams_admin/web/organisation/courseAdminEdit.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -43,15 +43,15 @@ - + - + - + @@ -92,7 +92,7 @@
: * *
:
:
:

- " onclick="bCancel=true;" class="btn btn-default"> + " /> " />
Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r198db26e45c4083d69e39fcd40ffed3f7918fc58 --- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) @@ -23,7 +23,7 @@ if (${not empty courseToDeleteLessons}) { // confirm redirect to "delete all lessons" page if (confirm('')) { - document.location.href = 'organisation/deleteAllLessonsInit.do?orgId=${courseToDeleteLessons}'; + document.location.href = '../organisation/deleteAllLessonsInit.do?orgId=${courseToDeleteLessons}'; } return false; } @@ -40,7 +40,7 @@ - + @@ -70,7 +70,15 @@
- + + + + +
+ + + +