Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -25,7 +25,6 @@ import java.io.File; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -40,9 +39,9 @@ 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; /** * @author jliew @@ -66,7 +65,8 @@ private MessageService adminMessageService; @RequestMapping(path = "/start") - public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception { + public String execute(@ModelAttribute CleanupForm cleanupForm, Errors errors, HttpServletRequest request) + throws Exception { // check user is sysadmin if (!(request.isUserInRole(Role.SYSADMIN))) { @@ -96,8 +96,7 @@ args[0] = new Integer(filesDeleted).toString(); request.setAttribute("filesDeleted", adminMessageService.getMessage("msg.cleanup.files.deleted", args)); } else { - errorMap.add("numDays", adminMessageService.getMessage("error.non.negative.number.required")); - request.setAttribute("errorMap", errorMap); + errors.reject("numDays", adminMessageService.getMessage("error.non.negative.number.required")); } } else { // recommended number of days to leave temp files Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -57,7 +57,7 @@ private WebApplicationContext applicationContext; @RequestMapping(path = "/importgroups") - public String execute(@ModelAttribute ImportExcelForm importForm, HttpServletRequest request) throws Exception { + public String execute(@ModelAttribute("importForm") ImportExcelForm importForm, HttpServletRequest request) throws Exception { if (request.getAttribute("CANCEL") != null) { return "redirect:/sysadminstart.do"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java (.../ImportUserResultController.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java (.../ImportUserResultController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -54,7 +54,7 @@ @Autowired private WebApplicationContext applicationContext; - @RequestMapping(path = "/importuserresult", method = RequestMethod.POST) + @RequestMapping(path = "/importuserresult") public String execute(HttpServletRequest request) throws Exception { MessageService messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -30,6 +30,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; +import org.lamsfoundation.lams.admin.web.form.ConfigForm; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.dto.BulkUpdateResultDTO; import org.lamsfoundation.lams.usermanagement.service.ILdapService; @@ -41,6 +42,7 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.WebApplicationContext; @@ -95,7 +97,7 @@ } @RequestMapping(path = "/start") - public String execute(HttpServletRequest request) throws Exception { + public String execute(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception { String action = WebUtil.readStrParam(request, "action", true); if (action != null) { @@ -138,7 +140,7 @@ return "ldap"; } - @RequestMapping(path = "/results", method = RequestMethod.POST) + @RequestMapping(path = "/results") public String results(HttpServletRequest request) throws Exception { HttpSession ss = SessionManager.getSession(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -52,7 +52,6 @@ + "news.html"; @RequestMapping("/loginsave") - @ResponseBody public String save(@ModelAttribute LoginMaintainForm loginMaintainForm, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -74,7 +73,7 @@ } } - return bWriter.toString(); + return "redirect:/sysadminstart.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -69,7 +69,7 @@ /** * Edits specified LTI tool consumer */ - @RequestMapping(path = "/edit", method = RequestMethod.POST) + @RequestMapping(path = "/edit") public String edit(@ModelAttribute LtiConsumerForm ltiConsumerForm, HttpServletRequest request) throws Exception { initServices(); @@ -136,7 +136,7 @@ return unspecified(request); } - String[] requiredFields = extServerForm.getRequiredFields(); + String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" }; for (String requiredField : requiredFields) { if (StringUtils.trimToNull(requiredField) == null) { errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField)); @@ -146,7 +146,7 @@ Integer sid = extServerForm.getSid(); //check duplication if (!errors.hasErrors()) { - String[] uniqueFields = extServerForm.getUniqueFields(); + String[] uniqueFields = { "serverid", "prefix" }; for (String uniqueField : uniqueFields) { List list = userManagementService.findByProperty(ExtServer.class, "uniqueField", uniqueField); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -53,6 +53,11 @@ @RequestMapping(path = "/edit") public String edit(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request) throws Exception { + + if (request.getAttribute("CANCEL") != null) { + return "redirect:/serverlist.do"; + } + Integer sid = WebUtil.readIntParam(request, "sid", true); if (sid != null) { ExtServer map = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()) Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -39,9 +39,9 @@ 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; import org.springframework.web.context.WebApplicationContext; /** @@ -62,44 +62,43 @@ private WebApplicationContext applicationContext; @RequestMapping(path = "/serversave") - public String execute(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request, + public String execute(@ModelAttribute ExtServerForm extServerForm, Errors errors, HttpServletRequest request, HttpServletResponse response) throws Exception { if (request.getAttribute("CANCEL") != null) { - return "servermaintain"; + return "redirect:/serverlist.do"; } service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); userService = AdminServiceProxy.getService(applicationContext.getServletContext()); messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" }; for (String requiredField : requiredFields) { if (StringUtils.trimToNull(requiredField) == null) { - errorMap.add("error.required", messageService.getMessage("sysadmin." + requiredField)); + errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField)); } } Integer sid = extServerForm.getSid(); - if (errorMap.isEmpty()) {//check duplication - String[] uniqueFields = extServerForm.getUniqueFields(); + if (!errors.hasErrors()) {//check duplication + String[] uniqueFields = { "serverid", "prefix" }; for (String uniqueField : uniqueFields) { List list = userService.findByProperty(ExtServer.class, "uniqueField", uniqueField); if (list != null && list.size() > 0) { if (sid.equals(-1)) {//new map - errorMap.add("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)); + errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)); } else { ExtServer map = (ExtServer) list.get(0); if (!map.getSid().equals(sid)) { - errorMap.add("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)); + errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)); } } } } } - if (errorMap.isEmpty()) { + if (!errors.hasErrors()) { ExtServer map = null; if (sid.equals(-1)) { map = new ExtServer(); @@ -111,9 +110,8 @@ 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/SessionMaintainController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java (.../SessionMaintainController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java (.../SessionMaintainController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -43,7 +43,7 @@ return "sessionmaintain"; } - @RequestMapping(path = "/delete", method = RequestMethod.POST) + @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) { String login = request.getParameter("login"); if (StringUtils.isNotBlank(login)) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -18,8 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; 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; @@ -50,7 +49,7 @@ private MessageService adminMessageService; @RequestMapping("/start") - public String execute(@ModelAttribute SignupManagementForm signupForm, HttpServletRequest request, + public String execute(@ModelAttribute("signupForm") SignupManagementForm signupForm, Errors errors, HttpServletRequest request, HttpServletResponse response) { try { @@ -72,7 +71,7 @@ } else if (StringUtils.equals(action, "edit")) { return edit(signupForm, request); } else if (StringUtils.equals(action, "add")) { - return add(signupForm, request); + return add(signupForm, errors, request); } else if (StringUtils.equals(action, "delete")) { return delete(request); } @@ -87,8 +86,8 @@ return "signupmanagement/list"; } - @RequestMapping(path = "/edit", method = RequestMethod.POST) - public String edit(@ModelAttribute SignupManagementForm signupForm, HttpServletRequest request) throws Exception { + @RequestMapping(path = "/edit") + public String edit(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request) throws Exception { Integer soid = WebUtil.readIntParam(request, "soid", false); @@ -119,23 +118,21 @@ } @RequestMapping(path = "/add") - public String add(@ModelAttribute SignupManagementForm signupForm, HttpServletRequest request) throws Exception { + public String add(@ModelAttribute("signupForm") SignupManagementForm signupForm, Errors errors, HttpServletRequest request) + throws Exception { // check if form submitted if (signupForm.getOrganisationId() != null && signupForm.getOrganisationId() > 0) { - MultiValueMap errorMap = new LinkedMultiValueMap<>(); // validate if (!StringUtils.equals(signupForm.getCourseKey(), signupForm.getConfirmCourseKey())) { - errorMap.add("courseKey", adminMessageService.getMessage("error.course.keys.unequal")); + errors.reject("courseKey", adminMessageService.getMessage("error.course.keys.unequal")); } if (signupService.contextExists(signupForm.getSignupOrganisationId(), signupForm.getContext())) { - errorMap.add("context", adminMessageService.getMessage("error.context.exists")); + errors.reject("context", adminMessageService.getMessage("error.context.exists")); } - if (!errorMap.isEmpty()) { - request.setAttribute("errorMap", errorMap); - } else { + if (!errors.hasErrors()) { // proceed SignupOrganisation signup; if (signupForm.getSignupOrganisationId() != null && signupForm.getSignupOrganisationId() > 0) { @@ -159,7 +156,7 @@ signup.setContext(signupForm.getContext()); userManagementService.save(signup); - return "forward:signupManagement/list.do"; + return "redirect:../signupManagement/start.do"; } } else { // form not submitted, default values @@ -172,7 +169,7 @@ return "signupmanagement/add"; } - @RequestMapping(path = "/delete", method = RequestMethod.POST) + @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { Integer soid = WebUtil.readIntParam(request, "soid"); @@ -181,6 +178,6 @@ userManagementService.deleteById(SignupOrganisation.class, soid); } - return "redirect:signupManagement/list.do"; + return "redirect:../signupManagement/start.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -76,7 +76,7 @@ return "statistics"; } - @RequestMapping(path = "/groupStats", method = RequestMethod.POST) + @RequestMapping(path = "/groupStats") public String groupStats(HttpServletRequest request) throws Exception { Integer orgId = WebUtil.readIntParam(request, "orgId"); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -110,7 +110,7 @@ /** * Shows page where admin can choose server timezone. */ - @RequestMapping(path = "/serverTimezoneManagement", method = RequestMethod.POST) + @RequestMapping(path = "/serverTimezoneManagement") public String serverTimezoneManagement(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception { @@ -132,7 +132,7 @@ /** * Changes server timezone with the one selected by user. */ - @RequestMapping(path = "/changeServerTimezone", method = RequestMethod.POST) + @RequestMapping(path = "/changeServerTimezone") public String changeServerTimezone(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception { timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -218,7 +218,7 @@ /** * Loads groups and libraries and displays the management dialog. */ - @RequestMapping(path = "/openLearningLibraryGroups", method = RequestMethod.POST) + @RequestMapping(path = "/openLearningLibraryGroups") public String openLearningLibraryGroups(HttpServletRequest request) throws IOException { // build full list of available learning libraries List learningLibraries = getLearningDesignService() Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportGroupsForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportGroupsForm.java (.../ImportGroupsForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportGroupsForm.java (.../ImportGroupsForm.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -22,6 +22,26 @@ package org.lamsfoundation.lams.admin.web.form; +import org.springframework.web.multipart.MultipartFile; + public class ImportGroupsForm { + private Integer orgId; + private MultipartFile file; + + public Integer getOrgId() { + return orgId; + } + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + } + + public MultipartFile getFile() { + return file; + } + + public void setFile(MultipartFile file) { + this.file = file; + } } Index: lams_admin/web/cleanup.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -40,13 +40,12 @@

-
    -
  • <%= TempDirectoryFilter.zip_prefix %>* : KB -
  • <%= TempDirectoryFilter.tmp_prefix %>* : KB +
  • * : KB +
  • * : KB

Index: lams_admin/web/config/editconfig.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -50,10 +50,10 @@ - - -    - + @@ -67,7 +67,7 @@
- " onclick="bCancel=true;" class="btn btn-default"> + " onclick="bCancel=true;" class="btn btn-default"> " />
Index: lams_admin/web/import/importGroups.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -10,7 +10,10 @@ <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> <%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> +<%= OrganisationType.CLASS_TYPE %> +<%= OrganisationType.COURSE_TYPE %> + @@ -64,29 +67,29 @@

- <% - List results = (List)request.getAttribute("results"); - for (int i=0; i"); - List rowResult = (List)results.get(i); - if (rowResult != null && rowResult.size() >= 4) { - if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) { - out.print(""); - out.print(""); - } else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) { - out.print(""); - out.print(""); - } - } else { // it's an error message - out.print(""); - } - out.println(""); - } - %> + + + + + + + + + + + + + + + + + + +
"+rowResult.get(0)+""+rowResult.get(1)+""+rowResult.get(0)+""+rowResult.get(1)+""); - for (int j=0; j"); - } - out.print("
+ +
+ +
Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -8,6 +8,11 @@ <%=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)%> @@ -21,12 +26,6 @@ - <%=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)%> - @@ -130,10 +129,6 @@ - - - - Index: lams_admin/web/import/importresult.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/import/importresult.jsp (.../importresult.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/import/importresult.jsp (.../importresult.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -20,7 +20,7 @@

- + Row : Index: lams_admin/web/ldap.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/ldap.jsp (.../ldap.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/ldap.jsp (.../ldap.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -4,6 +4,7 @@ <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %> <%@ page import="org.lamsfoundation.lams.usermanagement.service.ILdapService" %> +<%= ILdapService.SYNC_RESULTS %> @@ -17,9 +18,9 @@ Index: lams_admin/web/timezoneManagement.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -43,7 +43,7 @@

- + ${serverTimezone} @@ -61,7 +61,7 @@ - + @@ -72,7 +72,7 @@ - + ${timezoneDto.timeZoneId} @@ -96,7 +96,7 @@
" onclick="bCancel=true;" class="btn btn-default"> - " /> + " />

Index: lams_admin/web/timezoneServerManagement.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/timezoneServerManagement.jsp (.../timezoneServerManagement.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/timezoneServerManagement.jsp (.../timezoneServerManagement.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -43,7 +43,7 @@

- + ${timezoneDto.timeZoneId} Index: lams_admin/web/toolcontent/toolcontentlist.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -24,7 +24,7 @@ 'height' : 700, 'title' : '', 'open' : function(){ - $('#toolGroupsFrame', this).attr('src', './openLearningLibraryGroups.do'); + $('#toolGroupsFrame', this).attr('src', '../toolcontentlist/openLearningLibraryGroups.do'); }, 'beforeClose' : function(){ $('#toolGroupsFrame', this).attr('src', null); @@ -109,10 +109,10 @@ - [] + [] - [] + [] Index: lams_admin/web/userrole.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 --- lams_admin/web/userrole.jsp (.../userrole.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/userrole.jsp (.../userrole.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) @@ -55,7 +55,7 @@
:
- + role.
Index: lams_build/lib/lams/lams-admin.jar =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 Binary files differ