Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== diff -u -ra0a9327d7d5157b5fc508ddd2246ea7355e5f298 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision a0a9327d7d5157b5fc508ddd2246ea7355e5f298) +++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -13,6 +13,12 @@ + + + + + + @@ -35,7 +41,6 @@ - @@ -45,10 +50,10 @@ - - - - + + + + Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -r36dec686075045d22059eaecf6e8d310ea3b6a50 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -24,9 +24,7 @@ /* $Id$ */ package org.lamsfoundation.lams.admin.web; -import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -37,17 +35,13 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.admin.AdminConstants; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.UserOrganisation; -import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; @@ -75,87 +69,66 @@ * @struts:action-forward name="userlist" path="/usermanage.do" * @struts:action-forward name="remove" path=".remove" * @struts:action-forward name="disabledlist" path="/disabledmanage.do" + * @struts:action-forward name="usersearch" path="/usersearch.do" */ public class UserAction extends LamsDispatchAction { private static Logger log = Logger.getLogger(UserAction.class); private static IUserManagementService service; private static MessageService messageService; private static IAuditService auditService; - private static List rolelist; private static List locales; public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - // retain orgId to return to userlist - Integer orgId = WebUtil.readIntParam(request,"orgId"); - Organisation org = (Organisation)getService().findById(Organisation.class,orgId); - OrganisationType orgType = org.getOrganisationType(); - Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); - User requestor = (User)getService().getUserByLogin(request.getRemoteUser()); - Boolean hasRole = getService().isUserInRole(requestor.getUserId(), orgId, Role.COURSE_ADMIN) - || getService().isUserInRole(requestor.getUserId(), orgId, Role.COURSE_MANAGER); - Boolean canEdit = org.getCourseAdminCanAddNewUsers() && hasRole; - ActionMessages errors = new ActionMessages(); + DynaActionForm userForm = (DynaActionForm)form; + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + Integer userId = WebUtil.readIntParam(request,"userId",true); - request.setAttribute("rolelist",filterRoles(rolelist,isSysadmin, orgType)); - // set canEdit for whether user should be able to edit anything other than roles - request.setAttribute("canEdit",isSysadmin || canEdit); - request.setAttribute("locales",locales); + // test requestor's permission + Organisation org = null; + Boolean requestorHasRole = false; + if (orgId!=null) { + org = (Organisation)getService().findById(Organisation.class,orgId); + OrganisationType orgType = org.getOrganisationType(); + Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) + ? org.getParentOrganisation().getOrganisationId() : orgId; + User requestor = (User)getService().getUserByLogin(request.getRemoteUser()); + requestorHasRole = getService().isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_ADMIN) + || getService().isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_MANAGER); + } + Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); + + if (!(requestorHasRole || isSysadmin)) { + request.setAttribute("errorName", "UserAction"); + request.setAttribute("errorMessage", getMessageService().getMessage("error.authorisation")); + return mapping.findForward("error"); + } // editing a user - Integer userId = WebUtil.readIntParam(request,"userId",true); - DynaActionForm userForm = (DynaActionForm)form; - if(userId != null) { + if (userId!=null) { + User user = (User)getService().findById(User.class, userId); log.debug("got userid to edit: "+userId); - User user = (User)getService().findById(User.class,userId); BeanUtils.copyProperties(userForm, user); - userForm.set("password",null); - - String[] roles = null; - UserOrganisation uo = getService().getUserOrganisation(userId, orgId); - if (uo != null) { - Iterator iter2 = uo.getUserOrganisationRoles().iterator(); - roles = new String[uo.getUserOrganisationRoles().size()]; - int i=0; - while(iter2.hasNext()){ - UserOrganisationRole uor = (UserOrganisationRole)iter2.next(); - roles[i]=uor.getRole().getRoleId().toString(); - log.debug("got roleid: "+roles[i]); - i++; - } - } else { - errors.add("roles", new ActionMessage("error.not.member")); - saveErrors(request,errors); - } - userForm.set("roles",roles); + userForm.set("password", null); SupportedLocale locale = user.getLocale(); - userForm.set("localeId",locale.getLocaleId()); - - }else{ - String[] roles = new String[0]; - userForm.set("roles",roles); - try{ + userForm.set("localeId", locale.getLocaleId()); + } else { // create a user + try { String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); - log.debug("defaultLocale: "+defaultLocale); + log.debug("using defaultLocale: "+defaultLocale); SupportedLocale locale = getService().getSupportedLocale(defaultLocale.substring(0,2),defaultLocale.substring(3)); - userForm.set("localeId",locale.getLocaleId()); - }catch(Exception e){ + userForm.set("localeId", locale.getLocaleId()); + } catch(Exception e) { log.debug(e); } } - userForm.set("orgId", org.getOrganisationId()); + userForm.set("orgId", (org==null ? null : org.getOrganisationId())); + request.setAttribute("locales",locales); - Organisation parentOrg = org.getParentOrganisation(); - if(parentOrg!=null){ - request.setAttribute("pOrgId",parentOrg.getOrganisationId()); - request.setAttribute("pOrgName", parentOrg.getName()); - } - request.setAttribute("orgName",org.getName()); - request.setAttribute("orgType",orgType.getOrganisationTypeId()); return mapping.findForward("user"); } @@ -171,8 +144,8 @@ return mapping.findForward("error"); } - Integer orgId = WebUtil.readIntParam(request,"orgId"); - Integer userId = WebUtil.readIntParam(request,"userId",true); + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + Integer userId = WebUtil.readIntParam(request,"userId"); User user = (User)getService().findById(User.class,userId); Boolean hasData = getService().userHasData(user); @@ -194,16 +167,20 @@ return mapping.findForward("error"); } - Integer orgId = WebUtil.readIntParam(request,"orgId"); - Integer userId = WebUtil.readIntParam(request,"userId",true); + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + Integer userId = WebUtil.readIntParam(request,"userId"); getService().disableUser(userId); String[] args = new String[1]; args[0] = userId.toString(); String message = getMessageService().getMessage("audit.user.disable", args); getAuditService().log(AdminConstants.MODULE_NAME, message); - request.setAttribute("org",orgId); - return mapping.findForward("userlist"); + if (orgId==null || orgId==0) { + return mapping.findForward("usersearch"); + } else { + request.setAttribute("org",orgId); + return mapping.findForward("userlist"); + } } public ActionForward delete(ActionMapping mapping, @@ -217,8 +194,8 @@ return mapping.findForward("error"); } - Integer orgId = WebUtil.readIntParam(request,"orgId"); - Integer userId = WebUtil.readIntParam(request,"userId",true); + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + Integer userId = WebUtil.readIntParam(request,"userId"); try { getService().removeUser(userId); } catch (Exception e) { @@ -231,8 +208,12 @@ String message = getMessageService().getMessage("audit.user.delete", args); getAuditService().log(AdminConstants.MODULE_NAME, message); - request.setAttribute("org",orgId); - return mapping.findForward("userlist"); + if (orgId==null || orgId==0) { + return mapping.findForward("usersearch"); + } else { + request.setAttribute("org",orgId); + return mapping.findForward("userlist"); + } } // called from disabled users screen @@ -257,32 +238,15 @@ return mapping.findForward("disabledlist"); } - private List filterRoles(List rolelist, Boolean isSysadmin, OrganisationType orgType){ - List allRoles = new ArrayList(); - allRoles.addAll(rolelist); - Role role = new Role(); - if(!isSysadmin) { - role.setRoleId(Role.ROLE_SYSADMIN); - allRoles.remove(role); - } - if(orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { - role.setRoleId(Role.ROLE_COURSE_ADMIN); - allRoles.remove(role); - role.setRoleId(Role.ROLE_COURSE_MANAGER); - allRoles.remove(role); - } - return allRoles; - } - @SuppressWarnings("unchecked") private IUserManagementService getService(){ if(service==null){ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); locales = service.findAll(SupportedLocale.class); Collections.sort(locales); - rolelist = service.findAll(Role.class); - Collections.sort(rolelist); + //rolelist = service.findAll(Role.class); + //Collections.sort(rolelist); } return service; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java =================================================================== diff -u --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java (revision 0) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -0,0 +1,179 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.admin.web; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.OrganisationType; +import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.UserOrganisation; +import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.WebUtil; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +/** + * @author jliew + * + * @struts:action path="/userroles" + * name="UserRolesForm" + * scope="request" + * parameter="method" + * validate="false" + * + * @struts:action-forward name="userrole" path=".userrole" + * @struts:action-forward name="userlist" path="/usermanage.do" + */ +public class UserRolesAction extends Action { + + private static Logger log = Logger.getLogger(UserRolesAction.class); + private static IUserManagementService service; + private static MessageService messageService; + private static List rolelist; + + public ActionForward execute(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + + ActionMessages errors = new ActionMessages(); + DynaActionForm userRolesForm = (DynaActionForm)form; + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + Integer userId = WebUtil.readIntParam(request,"userId",true); + + // user and org ids passed as attributes by UserSaveAction + if (orgId==null) orgId = (Integer)request.getAttribute("orgId"); + if (orgId==null) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.org.invalid")); + saveErrors(request,errors); + return mapping.findForward("userrole"); + } + if (userId==null) userId = (Integer)request.getAttribute("userId"); + if (userId==null) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.userid.invalid")); + saveErrors(request,errors); + return mapping.findForward("userrole"); + } + log.debug("editing roles for userId: "+userId+" and orgId: "+orgId); + + // test requestor's permission + Organisation org = (Organisation)getService().findById(Organisation.class,orgId); + User user = (User)getService().findById(User.class, userId); + OrganisationType orgType = org.getOrganisationType(); + Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) + ? org.getParentOrganisation().getOrganisationId() : orgId; + Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); + User requestor = (User)getService().getUserByLogin(request.getRemoteUser()); + Boolean requestorHasRole = getService().isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_ADMIN) + || getService().isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_MANAGER); + + if (!(requestorHasRole || isSysadmin)) { + request.setAttribute("errorName","UserRolesAction"); + request.setAttribute("errorMessage",getMessageService().getMessage("error.authorisation")); + return mapping.findForward("error"); + } + + userRolesForm.set("userId",userId); + userRolesForm.set("orgId", org.getOrganisationId()); + request.setAttribute("rolelist",filterRoles(rolelist,isSysadmin,orgType)); + request.setAttribute("login", user.getLogin()); + request.setAttribute("fullName", user.getFullName()); + + String[] roles = null; + UserOrganisation uo = getService().getUserOrganisation(userId, orgId); + if (uo != null) { + Iterator iter2 = uo.getUserOrganisationRoles().iterator(); + roles = new String[uo.getUserOrganisationRoles().size()]; + int i=0; + while(iter2.hasNext()){ + UserOrganisationRole uor = (UserOrganisationRole)iter2.next(); + roles[i]=uor.getRole().getRoleId().toString(); + log.debug("got roleid: "+roles[i]); + i++; + } + } else { + ActionMessages messages = new ActionMessages(); + messages.add("roles", new ActionMessage("msg.add.to.org", org.getName())); + saveMessages(request,messages); + } + userRolesForm.set("roles",roles); + + return mapping.findForward("userrole"); + } + + private List filterRoles(List rolelist, Boolean isSysadmin, OrganisationType orgType){ + List allRoles = new ArrayList(); + allRoles.addAll(rolelist); + Role role = new Role(); + if(!isSysadmin) { + role.setRoleId(Role.ROLE_SYSADMIN); + allRoles.remove(role); + } + if(orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { + role.setRoleId(Role.ROLE_COURSE_ADMIN); + allRoles.remove(role); + role.setRoleId(Role.ROLE_COURSE_MANAGER); + allRoles.remove(role); + } + return allRoles; + } + + @SuppressWarnings("unchecked") + private IUserManagementService getService(){ + if(service==null){ + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + rolelist = service.findAll(Role.class); + Collections.sort(rolelist); + } + return service; + } + + private MessageService getMessageService(){ + if(messageService==null){ + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + messageService = (MessageService)ctx.getBean("adminMessageService"); + } + return messageService; + } +} Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesSaveAction.java =================================================================== diff -u --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesSaveAction.java (revision 0) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesSaveAction.java (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -0,0 +1,143 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.admin.web; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.apache.struts.action.Action; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.OrganisationType; +import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +/** + * @author jliew + * + * @struts:action path="/userrolessave" + * name="UserRolesForm" + * input=".userroles" + * scope="request" + * parameter="method" + * validate="false" + * + * @struts:action-forward name="userroles" path="/userroles.do" + * @struts:action-forward name="userlist" path="/usermanage.do" + */ +public class UserRolesSaveAction extends Action { + + private static Logger log = Logger.getLogger(UserRolesSaveAction.class); + private static IUserManagementService service; + private static List rolelist; + + public ActionForward execute(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) + throws Exception { + + ActionMessages errors = new ActionMessages(); + DynaActionForm userRolesForm = (DynaActionForm) form; + Integer orgId = (Integer) userRolesForm.get("orgId"); + Integer userId = (Integer) userRolesForm.get("userId"); + String[] roles = (String[]) userRolesForm.get("roles"); + + request.setAttribute("org", orgId); + + if (isCancelled(request)) { + return mapping.findForward("userlist"); + } + + log.debug("userId: "+userId+", orgId: "+orgId+" will have "+roles.length+" roles"); + Organisation org = (Organisation)getService().findById(Organisation.class, orgId); + User user = (User)getService().findById(User.class, userId); + + // user must have at least 1 role + if (roles.length < 1) { + errors.add("roles", new ActionMessage("error.roles.empty")); + saveErrors(request,errors); + request.setAttribute("rolelist",filterRoles(rolelist,request.isUserInRole(Role.SYSADMIN),org.getOrganisationType())); + request.setAttribute("login", user.getLogin()); + request.setAttribute("fullName", user.getFullName()); + return mapping.findForward("userroles"); + } + + // if user is to be added to a class, make user a member of parent course also if not already + List orgs = new ArrayList(); + orgs.add(org); + OrganisationType orgType = org.getOrganisationType(); + Organisation parentOrg = org.getParentOrganisation(); + if (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE) + && getService().getUserOrganisation(userId, parentOrg.getOrganisationId())==null) { + orgs.add(parentOrg); + } + for (Organisation o : orgs) { + getService().setRolesForUserOrganisation(user, o, (List)Arrays.asList(roles)); + } + + return mapping.findForward("userlist"); + } + + private List filterRoles(List rolelist, Boolean isSysadmin, OrganisationType orgType){ + List allRoles = new ArrayList(); + allRoles.addAll(rolelist); + Role role = new Role(); + if(!isSysadmin) { + role.setRoleId(Role.ROLE_SYSADMIN); + allRoles.remove(role); + } + if(orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { + role.setRoleId(Role.ROLE_COURSE_ADMIN); + allRoles.remove(role); + role.setRoleId(Role.ROLE_COURSE_MANAGER); + allRoles.remove(role); + } + return allRoles; + } + + private IUserManagementService getService(){ + if(service==null){ + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + rolelist = service.findAll(Role.class); + Collections.sort(rolelist); + } + return service; + } + +} Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java =================================================================== diff -u -r36dec686075045d22059eaecf6e8d310ea3b6a50 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -24,15 +24,14 @@ /* $Id$ */ package org.lamsfoundation.lams.admin.web; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; @@ -44,9 +43,6 @@ import org.lamsfoundation.lams.admin.AdminConstants; import org.lamsfoundation.lams.themes.CSSThemeVisualElement; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; -import org.lamsfoundation.lams.usermanagement.Organisation; -import org.lamsfoundation.lams.usermanagement.OrganisationType; -import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -72,88 +68,72 @@ * * @struts:action-forward name="user" path="/user.do?method=edit" * @struts:action-forward name="userlist" path="/usermanage.do" + * @struts:action-forward name="userroles" path="/userroles.do" + * @struts:action-forward name="usersearch" path="/usersearch.do" */ public class UserSaveAction extends Action { private static Logger log = Logger.getLogger(UserSaveAction.class); - private static IUserManagementService service; - private static List rolelist; @SuppressWarnings("unchecked") public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { + ActionMessages errors = new ActionMessages(); DynaActionForm userForm = (DynaActionForm) form; + Integer orgId = (Integer) userForm.get("orgId"); + Integer userId = (Integer) userForm.get("userId"); + + log.debug("orgId: " + orgId); Boolean edit = false; Boolean passwordChanged = true; - - Integer orgId = (Integer) userForm.get("orgId"); - Organisation org = (Organisation)getService().findById(Organisation.class, orgId); + SupportedLocale locale = (SupportedLocale)getService().findById(SupportedLocale.class, (Byte)userForm.get("localeId")); + log.debug("locale: " + locale); if (isCancelled(request)) { + if (orgId==null || orgId==0) { + return mapping.findForward("usersearch"); + } request.setAttribute("org", orgId); return mapping.findForward("userlist"); } - Integer userId = (Integer) userForm.get("userId"); - log.debug("got userId: " + userId); + if (userId != 0) edit = true; - if (userId != 0) - edit = true; - - ActionMessages errors = new ActionMessages(); - if ((userForm.get("login") == null) - || (userForm.getString("login").trim().length() == 0)) { + if ((userForm.get("login") == null) || (userForm.getString("login").trim().length() == 0)) { errors.add("login", new ActionMessage("error.login.required")); } - if (!userForm.get("password").equals(userForm.get("password2"))) { - errors.add("password", new ActionMessage( - "error.newpassword.mismatch")); + if (!StringUtils.equals((String)userForm.get("password"),((String)userForm.get("password2")))) { + errors.add("password", new ActionMessage("error.newpassword.mismatch")); } - if ((userForm.get("password") == null) - || (userForm.getString("password").trim().length() == 0)) { + if ((userForm.get("password") == null) || (userForm.getString("password").trim().length() == 0)) { passwordChanged = false; - if (!edit) - errors.add("password", new ActionMessage( - "error.password.required")); + if (!edit) errors.add("password", new ActionMessage("error.password.required")); } - - SupportedLocale locale = (SupportedLocale) getService().findById(SupportedLocale.class, (Byte)userForm.get("localeId")); - log.debug("locale: " + locale); - - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - IAuditService auditService = (IAuditService) ctx.getBean("auditService"); - MessageService messageService = (MessageService)ctx.getBean("adminMessageService"); + User user = null; if (errors.isEmpty()) { - String[] roles = (String[]) userForm.get("roles"); if (edit) { // edit user log.debug("editing userId: " + userId); - User user = (User)getService().findById(User.class, userId); + user = (User)getService().findById(User.class, userId); + // hash the new password if necessary, and audit the fact if (passwordChanged) { - // make 'password changed' audit log entry - String[] args = new String[1]; - args[0] = user.getLogin()+"("+userId+")"; - String message = messageService.getMessage("audit.user.password.change",args); - auditService.log(AdminConstants.MODULE_NAME, message); - userForm.set("password", HashUtil.sha1((String) userForm.get("password"))); + writeAuditLog(user, new String[1]); + userForm.set("password", HashUtil.sha1((String)userForm.get("password"))); } else { userForm.set("password", user.getPassword()); } BeanUtils.copyProperties(user, userForm); user.setLocale(locale); - log.debug("locale: " + locale); - getService().setRolesForUserOrganisation(user, org, (List)Arrays.asList(roles)); } else { // create user - log.debug("creating user..."); - User user = new User(); - userForm.set("password", HashUtil.sha1((String) userForm.get("password"))); + user = new User(); + userForm.set("password", HashUtil.sha1((String)userForm.get("password"))); BeanUtils.copyProperties(user, userForm); - log.debug("new login: " + user.getLogin()); + log.debug("creating user... new login: " + user.getLogin()); if (getService().getUserByLogin(user.getLogin()) != null) { - errors.add("loginUnique", new ActionMessage("error.login.unique")); + errors.add("login", new ActionMessage("error.login.unique")); } if (errors.isEmpty()) { // TODO set flash/html themes according to user input instead of server default. @@ -171,57 +151,62 @@ } user.setDisabledFlag(false); user.setCreateDate(new Date()); - user.setAuthenticationMethod((AuthenticationMethod) getService().findByProperty(AuthenticationMethod.class, + user.setAuthenticationMethod((AuthenticationMethod)getService().findByProperty(AuthenticationMethod.class, "authenticationMethodName","LAMS-Database").get(0)); user.setUserId(null); user.setLocale(locale); getService().save(user); // make 'create user' audit log entry - String[] args = new String[2]; - args[0] = user.getLogin()+"("+user.getUserId()+")"; - args[1] = user.getFullName(); - String message = messageService.getMessage("audit.user.create", args); - auditService.log(AdminConstants.MODULE_NAME, message); + writeAuditLog(user, new String[2]); log.debug("user: " + user.toString()); - List orgs = new ArrayList(); - // if user is to be added to a class, make user a member of - // parent course also - orgs.add(org); - OrganisationType orgType = org.getOrganisationType(); - if (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { - Organisation parentOrg = org.getParentOrganisation(); - orgs.add(parentOrg); - } - for (Organisation o : orgs) { - getService().setRolesForUserOrganisation(user, o, (List)Arrays.asList(roles)); - } } } } + if (errors.isEmpty()) { - request.setAttribute("org", orgId); - log.debug("orgId: " + orgId); - return mapping.findForward("userlist"); - } else { - if (!edit) { // error screen on create user shouldn't show empty roles - userForm.set("userId", null); + if (orgId==null || orgId==0) { + return mapping.findForward("usersearch"); } + if (edit) { + request.setAttribute("org", orgId); + return mapping.findForward("userlist"); + } else { + request.setAttribute("orgId", orgId); + request.setAttribute("userId", user.getUserId()); + return mapping.findForward("userroles"); + } + } else { saveErrors(request, errors); request.setAttribute("orgId", orgId); return mapping.findForward("user"); } } + private void writeAuditLog(User user, String[] args) { + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + IAuditService auditService = (IAuditService) ctx.getBean("auditService"); + MessageService messageService = (MessageService)ctx.getBean("adminMessageService"); + + if (args.length==1) { // password changed + args[0] = user.getLogin()+"("+user.getUserId()+")"; + String message = messageService.getMessage("audit.user.password.change",args); + auditService.log(AdminConstants.MODULE_NAME, message); + } else if (args.length==2) { // user created + args[0] = user.getLogin()+"("+user.getUserId()+")"; + args[1] = user.getFullName(); + String message = messageService.getMessage("audit.user.create", args); + auditService.log(AdminConstants.MODULE_NAME, message); + } + } @SuppressWarnings("unchecked") private IUserManagementService getService() { if (service == null) { WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); - rolelist = service.findAll(Role.class); } return service; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java =================================================================== diff -u -r34db810d47e7d309779560057fe06d360a403b20 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java (.../UserSearchAction.java) (revision 34db810d47e7d309779560057fe06d360a403b20) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java (.../UserSearchAction.java) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.beanutils.BeanUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; @@ -44,7 +43,6 @@ import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.WebUtil; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -86,10 +84,10 @@ DynaActionForm userSearchForm = (DynaActionForm)form; - String userId = ((String)userSearchForm.get("userId")).trim(); - String login = ((String)userSearchForm.get("login")).trim(); - String firstName = ((String)userSearchForm.get("firstName")).trim(); - String lastName = ((String)userSearchForm.get("lastName")).trim(); + String userId = ((String)userSearchForm.get("sUserId")).trim(); + String login = ((String)userSearchForm.get("sLogin")).trim(); + String firstName = ((String)userSearchForm.get("sFirstName")).trim(); + String lastName = ((String)userSearchForm.get("sLastName")).trim(); log.debug("got userId: '"+userId+"'"); log.debug("got login: '"+login+"'"); @@ -114,7 +112,7 @@ if(userList.isEmpty() && (Boolean)userSearchForm.get("searched")){ ActionMessages messages = new ActionMessages(); - messages.add("results",new ActionMessage("error.results.none")); + messages.add("results",new ActionMessage("msg.results.none")); saveMessages(request,messages); } Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml =================================================================== diff -u -ra2e0d660d0c50a18dd23de83d3f14ae98e2695c9 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision a2e0d660d0c50a18dd23de83d3f14ae98e2695c9) +++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -37,6 +37,11 @@ + + + + + Index: lams_admin/web/user.jsp =================================================================== diff -u -ra0a9327d7d5157b5fc508ddd2246ea7355e5f298 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/web/user.jsp (.../user.jsp) (revision a0a9327d7d5157b5fc508ddd2246ea7355e5f298) +++ lams_admin/web/user.jsp (.../user.jsp) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -10,23 +10,17 @@

- - "> :: - - userorgmanage.do?org="> - :: - User + - User +

- @@ -111,45 +105,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -44,9 +44,9 @@
*:
:
Name:
: - - -
- -
Index: lams_admin/web/userlist.jsp =================================================================== diff -u -r9743fe9c0ec896607074f765a86b1b3a03b5cd9f -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 9743fe9c0ec896607074f765a86b1b3a03b5cd9f) +++ lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -57,7 +57,7 @@ - +  
Index: lams_admin/web/userrole.jsp =================================================================== diff -u --- lams_admin/web/userrole.jsp (revision 0) +++ lams_admin/web/userrole.jsp (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -0,0 +1,42 @@ +<%@ page contentType="text/html; charset=utf-8" language="java" %> + +<%@ taglib uri="tags-html-el" prefix="html-el" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> + + + + +

+ +
+ + + + + + + + + + + + + + + + + +
:
:
: + + +
+ +
+ + + +
+ Index: lams_admin/web/usersearchlist.jsp =================================================================== diff -u -r85cc9e91bd65285a42ea0afbb8019f91fe3ceb85 -r54ff12d78b5d617bc7767b37faea406d5675a746 --- lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 85cc9e91bd65285a42ea0afbb8019f91fe3ceb85) +++ lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 54ff12d78b5d617bc7767b37faea406d5675a746) @@ -6,7 +6,7 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -

Find Users

+

@@ -21,10 +21,10 @@
- +   - +