Author: thomas.heute(a)jboss.com Date: 2007-06-28 10:25:17 -0400 (Thu, 28 Jun 2007) New Revision: 7608 Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java tags/JBoss_Portal_2_6_0/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp Log: User registration redirection was broken (mentionned in JBPORTAL-1512) Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-06-28 12:26:32 UTC (rev 7607) +++ tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-06-28 14:25:17 UTC (rev 7608) @@ -693,10 +693,12 @@ public void userRegister(JBossActionRequest req, JBossActionResponse resp) { // TODO: Check that a bot is not creating many accounts - String uname = req.getParameter("uname"); - resp.setRenderParameter("op", req.getParameters().get("lastView",OP_SHOWMENU)); + if (req.getParameter("Cancel") == null) + { int nbErrors = 0; + + String uname = req.getParameter("uname"); if ((uname == null) || (uname.length() == 0)) { nbErrors++; @@ -862,6 +864,17 @@ portletHelper.setRenderParameter(resp, "ANSWER", answer); portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWREGISTER); } + } + else + { + resp.setRenderParameter("op", req.getParameters().get("lastView",OP_SHOWMENU)); + try { + resp.setWindowState(WindowState.NORMAL); + } catch (WindowStateException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } private void fillContextWithUserProfile(User user, DelegateContext ctx) Modified: tags/JBoss_Portal_2_6_0/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp =================================================================== --- tags/JBoss_Portal_2_6_0/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-06-28 12:26:32 UTC (rev 7607) +++ tags/JBoss_Portal_2_6_0/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-06-28 14:25:17 UTC (rev 7608) @@ -60,26 +60,14 @@ <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100"> </td> </tr> - <%--<tr> - <td colspan="3" class="bottombuttonbar"> - <input name="register" type="submit" class="portlet-form-button" - value="${n:i18n("REGISTER_NEWUSER")}"/> - </td> - </tr>--%> + <tr> + <td colspan="3" class="bottombuttonbar"> + <input name="Save" class="portlet-form-button" id="register" type="submit" + value="${n:i18n("REGISTER_NEWUSER")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + value="${n:i18n("Cancel")}"/> + </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" - onclick="document.forms['<portlet:namespace/>register'].submit();" - value="${n:i18n("REGISTER_NEWUSER")}"/> - &nbsp; - <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" - onclick="document.forms['<portlet:namespace/>cancel'].submit();" - value="${n:i18n("Cancel")}"/> - </td> - </tr> </table> \ No newline at end of file