Index: lams_admin/.classpath =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/.classpath (.../.classpath) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/.classpath (.../.classpath) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -63,10 +63,6 @@ public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request) throws Exception { - if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; - } - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); MultipartFile file = importExcelForm.getFile(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -59,10 +59,6 @@ @RequestMapping(path = "/importgroups") public String execute(@ModelAttribute("importForm") ImportExcelForm importForm, HttpServletRequest request) throws Exception { - if (request.getAttribute("CANCEL") != null) { - return "redirect:/sysadminstart.do"; - } - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); importForm.setOrgId(0); MultipartFile file = importForm.getFile(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -145,6 +145,7 @@ HttpSession ss = SessionManager.getSession(); Object o = ss.getAttribute(ILdapService.SYNC_RESULTS); + request.setAttribute("syncResults", o); if (o instanceof BulkUpdateResultDTO) { BulkUpdateResultDTO dto = (BulkUpdateResultDTO) o; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -10,7 +10,6 @@ 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.ExtServerForm; import org.lamsfoundation.lams.admin.web.form.LtiConsumerForm; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; @@ -126,24 +125,19 @@ * Stores in the DB a new or edited LTI tool consumer */ @RequestMapping(path = "/save", method = RequestMethod.POST) - public String save(@ModelAttribute ExtServerForm extServerForm, Errors errors, HttpServletRequest request, + public String save(@ModelAttribute LtiConsumerForm ltiConsumerForm, Errors errors, HttpServletRequest request, HttpServletResponse response) throws Exception { initServices(); - if (request.getAttribute("CANCEL") != null) { - //show LTI consumer list page - return unspecified(request); - } - String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" }; for (String requiredField : requiredFields) { if (StringUtils.trimToNull(requiredField) == null) { errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField)); } } - Integer sid = extServerForm.getSid(); + Integer sid = ltiConsumerForm.getSid(); //check duplication if (!errors.hasErrors()) { String[] uniqueFields = { "serverid", "prefix" }; @@ -167,13 +161,13 @@ ExtServer ltiConsumer = null; if (sid.equals(0)) { ltiConsumer = new ExtServer(); - BeanUtils.copyProperties(ltiConsumer, extServerForm); + BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm); ltiConsumer.setSid(null); ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE); ltiConsumer.setUserinfoUrl("blank"); } else { ltiConsumer = integrationService.getExtServer(sid); - BeanUtils.copyProperties(ltiConsumer, extServerForm); + BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm); } integrationService.saveExtServer(ltiConsumer); return unspecified(request); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -54,10 +54,6 @@ @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 -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -65,10 +65,6 @@ public String execute(@ModelAttribute ExtServerForm extServerForm, Errors errors, HttpServletRequest request, HttpServletResponse response) throws Exception { - if (request.getAttribute("CANCEL") != null) { - return "redirect:/serverlist.do"; - } - service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); userService = AdminServiceProxy.getService(applicationContext.getServletContext()); messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -201,18 +201,17 @@ } @RequestMapping("/disableLibrary") - private void disableLibrary(HttpServletRequest request) { + public void disableLibrary(HttpServletRequest request) { Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); ILearningDesignService ldService = getLearningDesignService(); ldService.setValid(learningLibraryId, false); } @RequestMapping("/enableLibrary") - private void enableLibrary(HttpServletRequest request) { + public void enableLibrary(HttpServletRequest request) { Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); ILearningDesignService ldService = getLearningDesignService(); ldService.setValid(learningLibraryId, true); - } /** Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -313,7 +313,7 @@ return "remove"; } - @RequestMapping(path = "/disable", method = RequestMethod.POST) + @RequestMapping(path = "/disable") public String disable(HttpServletRequest request) throws Exception { initServices(); @@ -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,15 +370,15 @@ 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"; } } // called from disabled users screen - @RequestMapping(path = "/enable", method = RequestMethod.POST) + @RequestMapping(path = "/enable") public String enable(HttpServletRequest request) throws Exception { initServices(); @@ -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/UserSaveController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -50,6 +50,7 @@ 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; @@ -83,7 +84,7 @@ private WebApplicationContext applicationContext; @RequestMapping(path = "/saveUserDetails", method = RequestMethod.POST) - public String saveUserDetails(@ModelAttribute UserForm userForm, HttpServletRequest request, + public String saveUserDetails(@ModelAttribute UserForm userForm, Errors errors, HttpServletRequest request, HttpServletResponse response) throws Exception { messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); @@ -110,8 +111,6 @@ UserSaveController.log.debug("locale: " + locale); UserSaveController.log.debug("authenticationMethod:" + authenticationMethod); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - if (request.getAttribute("CANCEL") != null) { if ((orgId == null) || (orgId == 0)) { return "redirect:/usersearch.do"; @@ -129,17 +128,17 @@ // login validation String login = userForm.getLogin() == null ? null : userForm.getLogin().trim(); if (StringUtils.isBlank(login)) { - errorMap.add("login", messageService.getMessage("error.login.required")); + errors.reject("login", messageService.getMessage("error.login.required")); } else if (!ValidationUtil.isUserNameValid(login)) { - errorMap.add("login", messageService.getMessage("error.username.invalid.characters")); + errors.reject("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 { - errorMap.add("login", messageService.getMessage("error.login.unique", + errors.reject("login", messageService.getMessage("error.login.unique", "(" + login + ", ID: " + existingUser.getUserId() + ")")); } } @@ -148,28 +147,28 @@ //first name validation String firstName = (userForm.getFirstName() == null) ? null : userForm.getFirstName(); if (StringUtils.isBlank(firstName)) { - errorMap.add("firstName", messageService.getMessage("error.firstname.required")); + errors.reject("firstName", messageService.getMessage("error.firstname.required")); } else if (!ValidationUtil.isFirstLastNameValid(firstName)) { - errorMap.add("firstName", messageService.getMessage("error.firstname.invalid.characters")); + errors.reject("firstName", messageService.getMessage("error.firstname.invalid.characters")); } //last name validation String lastName = (userForm.getLastName() == null) ? null : userForm.getLastName(); if (StringUtils.isBlank(lastName)) { - errorMap.add("lastName", messageService.getMessage("error.lastname.required")); + errors.reject("lastName", messageService.getMessage("error.lastname.required")); } else if (!ValidationUtil.isFirstLastNameValid(lastName)) { - errorMap.add("lastName", messageService.getMessage("error.lastname.invalid.characters")); + errors.reject("lastName", messageService.getMessage("error.lastname.invalid.characters")); } //user email validation String userEmail = (userForm.getEmail() == null) ? null : userForm.getEmail(); if (StringUtils.isBlank(userEmail)) { - errorMap.add("email", messageService.getMessage("error.email.required")); + errors.reject("email", messageService.getMessage("error.email.required")); } else if (!ValidationUtil.isEmailValid(userEmail)) { - errorMap.add("email", messageService.getMessage("error.valid.email.required")); + errors.reject("email", messageService.getMessage("error.valid.email.required")); } - if (errorMap.isEmpty()) { + if (!errors.hasErrors()) { if (edit) { // edit user UserSaveController.log.debug("editing userId: " + userId); // hash the new password if necessary, and audit the fact @@ -188,24 +187,24 @@ String password2 = userForm.getPassword2(); String password = (userForm.getPassword() == null) ? null : userForm.getPassword(); if (StringUtils.isBlank(password)) { - errorMap.add("password", messageService.getMessage("error.password.required")); + errors.reject("password", messageService.getMessage("error.password.required")); } if (!StringUtils.equals(password, (userForm.getPassword2()))) { - errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); + errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); } if (!ValidationUtil.isPasswordValueValid(password, password2)) { - errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); + errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); } - if (errorMap.isEmpty()) { + if (!errors.hasErrors()) { 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 (errorMap.isEmpty()) { + if (!errors.hasErrors()) { // TODO set theme according to user input // instead of server default. user.setTheme(UserSaveController.service.getDefaultTheme()); @@ -231,7 +230,7 @@ } } - if (errorMap.isEmpty()) { + if (!errors.hasErrors()) { if ((orgId == null) || (orgId == 0)) { return "redirect:/usersearch.do"; } @@ -244,17 +243,15 @@ return "redirect:/userroles.do"; } } else { - request.setAttribute("errorMap", errorMap); request.setAttribute("orgId", orgId); return "redirect:/user/edit.do"; } } - @RequestMapping(path = "/changePass", method = RequestMethod.POST) - public String changePass(HttpServletRequest request, HttpServletResponse response) throws Exception { + @RequestMapping(path = "/changePass") + public String changePass(HttpServletRequest request, Errors errors, HttpServletResponse response) throws Exception { UserSaveController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); Integer userId = WebUtil.readIntParam(request, "userId", true); ISecurityService securityService = AdminServiceProxy.getSecurityService(applicationContext.getServletContext()); Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); @@ -270,17 +267,17 @@ //password validation if (StringUtils.isBlank(password)) { - errorMap.add("password", messageService.getMessage("error.password.required")); + errors.reject("password", messageService.getMessage("error.password.required")); } if (!StringUtils.equals(password, password2)) { - errorMap.add("password", messageService.getMessage("error.newpassword.mismatch")); + errors.reject("password", messageService.getMessage("error.newpassword.mismatch")); } if (!ValidationUtil.isPasswordValueValid(password, password2)) { - errorMap.add("password", messageService.getMessage("label.password.restrictions")); + errors.reject("password", messageService.getMessage("label.password.restrictions")); } - if (errorMap.isEmpty()) { + if (!errors.hasErrors()) { User user = (User) UserSaveController.service.findById(User.class, userId); String salt = HashUtil.salt(); String passwordHash = HashUtil.sha256(password, salt); @@ -289,7 +286,6 @@ UserSaveController.service.saveUser(user); return "redirect:/user/edit.do"; } - request.setAttribute("errorMap", errorMap); return "userChangePass"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java (.../ExtServerForm.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java (.../ExtServerForm.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -48,9 +48,9 @@ private Integer timeToLiveLoginRequest = 80; - private String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" }; + private String[] requiredFields; - private String[] uniqueFields = { "serverid", "prefix" }; + private String[] uniqueFields; public Integer getSid() { return sid; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java (.../LtiConsumerForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java (.../LtiConsumerForm.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -43,7 +43,11 @@ private boolean timeToLiveLoginRequestEnabled = false; private String ltiToolConsumerMonitorRoles; + + private String[] requiredFields; + private String[] uniqueFields; + public Integer getSid() { return sid; } @@ -124,4 +128,19 @@ this.ltiToolConsumerMonitorRoles = ltiToolConsumerMonitorRoles; } + public String[] getRequiredFields() { + return requiredFields; + } + + public void setRequiredFields(String[] requiredFields) { + this.requiredFields = requiredFields; + } + + public String[] getUniqueFields() { + return uniqueFields; + } + + public void setUniqueFields(String[] uniqueFields) { + this.uniqueFields = uniqueFields; + } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java (.../ThemeForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java (.../ThemeForm.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -22,8 +22,6 @@ */ package org.lamsfoundation.lams.admin.web.form; -import org.apache.struts.action.ActionForm; - /** * * Form for theme management @@ -39,22 +37,13 @@ public ThemeForm() { } - private String method; private Long id; private String name; private String description; private String imageDirectory; private Boolean currentDefaultTheme; private String type; - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - public Long getId() { return id; } @@ -104,7 +93,6 @@ } public void clear() { - this.method = null; this.id = null; this.name = null; this.description = null; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java (.../UserOrgRoleForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java (.../UserOrgRoleForm.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -37,9 +37,7 @@ */ /** - * struts doclet * - * */ public class UserOrgRoleForm { Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_admin/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -212,192 +212,6 @@ - - STRUTS-textarea - org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag - empty - - accesskey - false - true - - - alt - false - true - - - altKey - false - true - - - bundle - false - true - - - cols - false - true - - - disabled - false - true - - - errorKey - false - true - - - errorStyle - false - true - - - errorStyleClass - false - true - - - errorStyleId - false - true - - - index - false - true - - - indexed - false - true - - - name - false - true - - - onblur - false - true - - - onchange - false - true - - - onclick - false - true - - - ondblclick - false - true - - - onfocus - false - true - - - onkeydown - false - true - - - onkeypress - false - true - - - onkeyup - false - true - - - onmousedown - false - true - - - onmousemove - false - true - - - onmouseout - false - true - - - onmouseover - false - true - - - onmouseup - false - true - - - property - true - true - - - readonly - false - true - - - rows - false - true - - - style - false - true - - - styleClass - false - true - - - styleId - false - true - - - tabindex - false - true - - - title - false - true - - - titleKey - false - true - - - value - false - true - - - Small portrait of a user User Portrait Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/validation.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/WEB-INF/web.xml =================================================================== diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision d4dec47dab74477560cfee18e74c7e4494bd1426) +++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -145,41 +145,6 @@ - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - Index: lams_admin/web/cleanup.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/cleanup.jsp (.../cleanup.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -40,7 +40,7 @@

- +
    @@ -60,7 +60,7 @@

    - " onclick="bCancel=true;" class="btn btn-default"> + " />
    Index: lams_admin/web/config/editconfig.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -3,7 +3,6 @@ <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem"%> -<%= ConfigurationItem.BOOLEAN_FORMAT %> @@ -48,11 +47,12 @@ + - + + Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/config/items.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/import/importGroups.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -66,28 +66,33 @@

    - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + +
    - -
    -     -     		+ +
    +     +
    @@ -118,7 +123,7 @@
    - " onclick="bCancel=true;" class="btn btn-default"> + " />  
    Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -24,8 +24,7 @@ - - + @@ -122,7 +121,7 @@
    - " onclick="bCancel=true;" id="cancelButton" class="btn btn-default"> + " />  
    Index: lams_admin/web/includes/javascript/learningLibraryGroup.js =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/includes/javascript/learningLibraryGroup.js (.../learningLibraryGroup.js) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/includes/javascript/learningLibraryGroup.js (.../learningLibraryGroup.js) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -229,7 +229,7 @@ $.ajax({ 'async' : false, 'cache' : false, - 'url' : 'toolcontentlist/saveLearningLibraryGroups.do', + 'url' : '../toolcontentlist/saveLearningLibraryGroups.do', 'data' : { 'groups' : JSON.stringify(groups) }, Index: lams_admin/web/ldap.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/ldap.jsp (.../ldap.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/ldap.jsp (.../ldap.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -19,10 +19,10 @@ Index: lams_admin/web/logevent.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/logevent.jsp (.../logevent.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/logevent.jsp (.../logevent.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -96,7 +96,7 @@ cssPageDisplay: '.pagedisplay', cssPageSize: '.pagesize', cssDisabled: 'disabled', - ajaxUrl : "", ajaxProcessing: function (data, table) { if (data && data.hasOwnProperty('rows')) { var rows = [], Index: lams_admin/web/lti/ltiConsumer.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/lti/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/lti/ltiConsumer.jsp (.../ltiConsumer.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -25,7 +25,7 @@ $(document).ready(function(){ // validate signup form on keyup and submit - var validator = $("#ext-server-form").validate({ + var validator = $("#ltiConsumerForm").validate({ rules: { serverid: "required", serverkey: "required", @@ -102,7 +102,7 @@
    - " onclick="bCancel=true;" class="btn btn-default"> + " />
    Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -158,7 +158,6 @@
    Index: lams_admin/web/remove.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/remove.jsp (.../remove.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/remove.jsp (.../remove.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -19,15 +19,15 @@
    - + - + - +
    @@ -41,7 +41,7 @@

    - + @@ -53,7 +53,7 @@
    - +
    @@ -62,7 +62,7 @@

      

    - + Index: lams_admin/web/serverlist.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/serverlist.jsp (.../serverlist.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/serverlist.jsp (.../serverlist.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -46,18 +46,18 @@ - +   - + - +   - + Index: lams_admin/web/servermaintain.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -59,7 +59,7 @@ -

    +

    @@ -102,7 +102,7 @@ style="display:none;"> - + @@ -120,7 +120,7 @@
    " /> - " onclick="bCancel=true;" class="btn btn-default"> + " />
    Index: lams_admin/web/signupmanagement/add.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -23,7 +23,7 @@
    - + @@ -55,10 +55,10 @@ - + - + @@ -93,7 +93,7 @@
    :
    :
    - " onclick="bCancel=true;" class="btn btn-default"> + " />
    Index: lams_admin/web/taglibs.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/taglibs.jsp (.../taglibs.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/taglibs.jsp (.../taglibs.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -4,11 +4,4 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-function" prefix="fn" %> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-tiles" prefix="tiles" %> -<%@ taglib uri="tags-html-el" prefix="html-el" %> -<%@ taglib uri="tags-bean-el" prefix="bean-el" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> Fisheye: Tag 9d51ed040508d8d5a10ee4033aded0c3784490a8 refers to a dead (removed) revision in file `lams_admin/web/template.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/themeManagement.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/themeManagement.jsp (.../themeManagement.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/themeManagement.jsp (.../themeManagement.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -65,13 +65,14 @@ return; } - submitForm(); + submitForm('addOrEditTheme'); } function submitForm(methodName) { - var f = document.getElementById("themeForm").submit(); + var f = document.getElementById("themeForm") += methodName + ".do"; f.submit(); } + Index: lams_admin/web/timezoneManagement.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -38,7 +38,7 @@ - +

    @@ -72,7 +72,7 @@ - + ${timezoneDto.timeZoneId} Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp =================================================================== diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/toolcontent/learningLibraryGroup.jsp (.../learningLibraryGroup.jsp) (revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49) +++ lams_admin/web/toolcontent/learningLibraryGroup.jsp (.../learningLibraryGroup.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -34,31 +34,31 @@ -
    - -
    - - - - - - -
    -
    -     		-
    -
    -
    -
    - - -
    -
    - - +
    +
    -
    -
    + + + + + + +
    +
    +     		+
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    \ No newline at end of file Index: lams_admin/web/toolcontent/toolcontentlist.jsp =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/web/toolcontent/toolcontentlist.jsp (.../toolcontentlist.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -24,7 +24,7 @@ 'height' : 700, 'title' : '', 'open' : function(){ - $('#toolGroupsFrame', this).attr('src', '../toolcontentlist/openLearningLibraryGroups.do'); + $('#toolGroupsFrame', this).attr('src', './openLearningLibraryGroups.do'); }, 'beforeClose' : function(){ $('#toolGroupsFrame', this).attr('src', null); @@ -109,15 +109,16 @@ - [] + [] - [] + [] + - ?toolContentID=&contentFolderID=-1" + ?toolContentID=${dto.toolContentID}&contentFolderID=-1" [] Index: lams_admin/web/user.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/user.jsp (.../user.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/user.jsp (.../user.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -157,8 +157,8 @@ - - + + @@ -466,12 +466,11 @@
    - +
    - " - formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-default"/> + " /> " />
    Index: lams_admin/web/userChangePass.jsp =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r9d51ed040508d8d5a10ee4033aded0c3784490a8 --- lams_admin/web/userChangePass.jsp (.../userChangePass.jsp) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/web/userChangePass.jsp (.../userChangePass.jsp) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) @@ -130,14 +130,7 @@
- - - - - - - - +
${param.login}