[portal-commits] JBoss Portal SVN: r7343 - in trunk/core/src: resources/portal-core-war/WEB-INF/jsp/role and 1 other directories.

Author: bdaw Date: 2007-05-26 17:16:16 -0400 (Sat, 26 May 2007) New Revision: 7343 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp Log: JBPORTAL-1437 - The cancel button should send you back to view that you came from, not back to the Members page. Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2007-05-25 16:40:42 UTC (rev 7342) +++ trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2007-05-26 21:16:16 UTC (rev 7343) @@ -325,6 +325,10 @@ PortletURL editURL = resp.createRenderURL(); editURL.setParameter(getOperationName(), OP_SHOWADDROLESTOUSER); editURL.setParameter("userid", "" + user.getId()); + editURL.setParameter("roleid", "" + role.getId()); + editURL.setParameter("usernamefilter", usernameFilter); + editURL.setParameter("offset", "" + offset); + editURL.setParameter("usersperpage", "" + usersPerPage); rowCtx.put("editURL", editURL.toString()); } @@ -398,7 +402,14 @@ try { + ctx.put("usernamefilter", req.getParameter("usernamefilter")); + ctx.put("offset", req.getParameter("offset")); + ctx.put("usersperpage", req.getParameter("usersperpage")); + ctx.put("roleid", req.getParameter("roleid")); + + User user = userModule.findUserById(req.getParameter("userid")); + ctx.put("userid", user.getId().toString()); ctx.put("username", user.getUserName()); ctx.put("userfullname", getFullName(bundle, user)); @@ -663,6 +674,12 @@ if (request.isUserInRole(ADMIN_ROLE)) { String userId = request.getParameters().getParameter("userid"); + + response.setRenderParameter("usernamefilter", request.getParameter("usernamefilter")); + response.setRenderParameter("offset", request.getParameter("offset")); + response.setRenderParameter("roleid", request.getParameter("roleid")); + response.setRenderParameter("usersperpage", request.getParameter("usersperpage")); + if (request.getParameterMap().keySet().contains("addRoles")) { String[] selectedRoles = request.getParameterValues("assignedRoles"); @@ -757,6 +774,9 @@ User user = userModule.findUserById(userId); Set roles = roleModule.findRolesByNames(selectedRoles); membershipModule.assignRoles(user, roles); + + response.setRenderParameter("op", OP_SHOWLISTROLEMEMBERS ); + response.setRenderParameter("userid", userId); } catch (IllegalArgumentException e) { Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2007-05-25 16:40:42 UTC (rev 7342) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2007-05-26 21:16:16 UTC (rev 7343) @@ -12,9 +12,17 @@ <th/> <th>${n:i18n("ASSIGNEDROLES")}</th> </tr> - <form name="<portlet:namespace/>editRoles" method="post" action="<portlet:actionURL><portlet:param name="op" value="addRolesToUser"/></portlet:actionURL>"> + <form name="<portlet:namespace/>editRoles" method="post" + action="<portlet:actionURL> + <portlet:param name="op" value="addRolesToUser"/> + </portlet:actionURL>"> <input type="hidden" name="userid" value="${n:out("userid")}"/> + <input type="hidden" name="usernamefilter" value="${n:out("usernamefilter")}"/> + <input type="hidden" name="offset" value="${n:out("offset")}"/> + <input type="hidden" name="roleid" value="${n:out("roleid")}"/> + <input type="hidden" name="usersperpage" value="${n:out("usersperpage")}"/> + <n:iterate ctx="userRoles"> <input type="hidden" name="assignedRoles" value="${n:out("userRoles.name")}"/> </n:iterate> @@ -57,7 +65,13 @@ </tr> <form name="<portlet:namespace/>cancel" - action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" + action="<portlet:actionURL windowState="normal"> + <portlet:param name="op" value="showListEditRoleMembers"/> + <portlet:param name="usernamefilter" value="${n:out('usernamefilter')}"/> + <portlet:param name="roleid" value="${n:out('roleid')}"/> + <portlet:param name="usersperpage" value="${n:out('usersperpage')}"/> + <portlet:param name="offset" value="${n:out('offset')}"/> + </portlet:actionURL>" method="post"/> </table> </span> Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-05-25 16:40:42 UTC (rev 7342) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-05-26 21:16:16 UTC (rev 7343) @@ -8,7 +8,7 @@ <hr/> <table cellpadding="0" cellspacing="8" border="0" class="pn-normal"> -<form action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post"> +<form name="<portlet:namespace/>save" action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post"> <input type="hidden" name="userid" value="${n:out("userid")}"/> <tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> @@ -175,11 +175,25 @@ <td class="pn-normal"><input type="text" name="answer" value="${n:out("ANSWER")}" size="30" maxlength="100"></td> </tr> <tr> - <td colspan="3" class="bottombuttonbar"><input class="portlet-form-button" type="submit" + <%--<td colspan="3" class="bottombuttonbar"><input class="portlet-form-button" type="submit" value="${n:i18n("REGISTER_SAVECHANGES")}"> <span class="portlet-font"><a href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span> - </td> + </td>--%> </tr> </form> +<tr> + <td colspan="3"> + <input name="Save" class="portlet-form-button" id="Assign" type="submit" + onclick="document.forms['<portlet:namespace/>save'].submit();" + value="${n:i18n("REGISTER_SAVECHANGES")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancel'].submit();" + value="${n:i18n("Cancel")}"/> +</tr> +<form + name="<portlet:namespace/>cancel" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>" + method="post"/> </table> \ No newline at end of file