Author: bdaw Date: 2007-05-25 06:52:11 -0400 (Fri, 25 May 2007) New Revision: 7337 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp Log: JBPORTAL-1428 - Creating a user should take you back to the screen you came from, not back to the members page. Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-05-25 09:40:46 UTC (rev 7336) +++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-05-25 10:52:11 UTC (rev 7337) @@ -486,6 +486,8 @@ { DelegateContext ctx = new DelegateContext(); + ctx.put("usernamefilter", req.getParameter("usernamefilter")); + try { User user = userModule.findUserById(req.getParameter("userid")); @@ -495,31 +497,12 @@ Set userRoles = membershipModule.getRoles(user); Set roles = roleModule.findRoles(); - Role[] rolesArray = new Role[roles.size()]; - //rolesArray = (Role[])roles.toArray(rolesArray); - /*Role role; - DelegateContext rowCtx = null; - for (int i = 0; i < rolesArray.length; i++) - { - int oddeven = i % 3; - role = rolesArray[i]; - if (oddeven == 0) - { - rowCtx = ctx.next("row"); - } - DelegateContext colCtx = rowCtx.next("col"); - if (userRoles.contains(role)) - { - colCtx.put("ischecked", "checked"); - } - colCtx.put("name", role.getName()); - colCtx.put("displayname", role.getDisplayName()); - }*/ - Role role = null; + + DelegateContext allRolesCtx = null; for (Iterator it = roles.iterator(); it.hasNext();) { @@ -1097,7 +1080,8 @@ if (request.isUserInRole("Admin")) { - String userId = request.getParameters().getParameter("userid"); + String userId = request.getParameters().getParameter("userid"); + response.setRenderParameter("usernamefilter", request.getParameter("usernamefilter")); if (request.getParameterMap().keySet().contains("addRoles")) { Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp =================================================================== (Binary files differ)