Author: bdaw Date: 2007-05-26 18:12:54 -0400 (Sat, 26 May 2007) New Revision: 7344 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.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-26 21:16:16 UTC (rev 7343) +++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2007-05-26 22:12:54 UTC (rev 7344) @@ -563,6 +563,10 @@ { if (req.isUserInRole("Admin")) { + DelegateContext ctx = new DelegateContext(); + ctx.put("lastView", req.getParameters().get("lastView", "showMenu")); + req.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/registerUser.jsp"); rd.include(req, resp); } @@ -691,6 +695,8 @@ { // TODO: Check that a bot is not creating many accounts String uname = req.getParameter("uname"); + resp.setRenderParameter("op", req.getParameters().get("lastView",OP_SHOWMENU)); + int nbErrors = 0; if ((uname == null) || (uname.length() == 0)) { @@ -825,8 +831,15 @@ { log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation"); } - resp.setRenderParameter("op", OP_SHOWREGISTER_TY); - resp.setWindowState(WindowState.NORMAL); + //resp.setRenderParameter("op", OP_SHOWREGISTER_TY); + if (req.getParameters().get("lastView",OP_SHOWMENU).equals(OP_SHOWLISTUSERS)) + { + resp.setWindowState(WindowState.MAXIMIZED); + } + else + { + resp.setWindowState(WindowState.NORMAL); + } } catch (IllegalArgumentException e) { Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-05-26 21:16:16 UTC (rev 7343) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-05-26 22:12:54 UTC (rev 7344) @@ -95,5 +95,6 @@ href=" <portlet:renderURL windowState="maximized"> <portlet:param name="op" value="showRegister"/> + <portlet:param name="lastView" value="showListUsers"/> </portlet:renderURL> ">${n:i18n("REGISTER_REGISTER_ADMIN_LINK")}</a> \ No newline at end of file Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp =================================================================== (Binary files differ) Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-26 21:16:16 UTC (rev 7343) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-26 22:12:54 UTC (rev 7344) @@ -15,6 +15,7 @@ <table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal"> <form name="<portlet:namespace/>register" action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post"> + <input name="lastView" value="${n:out('lastView')}" type="hidden"/> <tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> </tr> @@ -62,10 +63,6 @@ </td>--%> </tr> </form> - <form - name="<portlet:namespace/>cancel" - method="post" - action="<portlet:renderURL windowState="normal"/>"/> <tr> <td colspan="3" class="bottombuttonbar"> <input name="Save" class="portlet-form-button" id="register" type="submit" @@ -77,5 +74,12 @@ value="${n:i18n("Cancel")}"/> </td> </tr> + <form + name="<portlet:namespace/>cancel" + method="post" + action="<portlet:renderURL windowState="maximized"> + <portlet:param name="op" value="${n:out('lastView')}"/> + </portlet:renderURL>"/> + </table> \ No newline at end of file