Author: bdaw Date: 2007-05-21 12:22:07 -0400 (Mon, 21 May 2007) New Revision: 7301 Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp Log: JBPORTAL-1457 In UserPortlet when listing user entering a search filter and pressing "Search" returns user to Members page. Same in RolePortlet. Seems related to recent change to use javascript to submit a form. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 15:43:25 UTC (rev 7300) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 16:22:07 UTC (rev 7301) @@ -74,10 +74,6 @@ </select> <br/> </form> -<form - name="<portlet:namespace/>cancelEditListRoleMembers" - action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" - method="post"/> <p> <input name="Find" class="portlet-form-button" id="Save" type="submit" onclick="document.forms['<portlet:namespace/>editListRoleMembers'].submit();" @@ -86,4 +82,8 @@ <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" onclick="document.forms['<portlet:namespace/>cancelEditListRoleMembers'].submit();" value="${n:i18n("Cancel")}"/> -</p> \ No newline at end of file +</p> +<form + name="<portlet:namespace/>cancelEditListRoleMembers" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" + method="post"/> 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-21 15:43:25 UTC (rev 7300) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-05-21 16:22:07 UTC (rev 7301) @@ -57,7 +57,6 @@ </div> <br/> - <form id="<portlet:namespace/>searchUsers" action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" @@ -74,18 +73,19 @@ </select> <br/> </form> +<input name="Save" class="portlet-form-button" id="Save" type="submit" + onclick="document.forms['<portlet:namespace/>searchUsers'].submit();" + value="${n:i18n("Search")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancel'].submit();" + value="${n:i18n("Cancel")}"/> <form name="<portlet:namespace/>cancel" action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>" method="post"/> -<input name="Save" class="portlet-form-button" id="Save" type="submit" - onclick="document.forms['<portlet:namespace/>searchUsers'].submit();" - value="${n:i18n("Search")}"/> -&nbsp; -<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" - onclick="document.forms['<portlet:namespace/>cancel'].submit();" - value="${n:i18n("Cancel")}"/> + <br/> <a id="register" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>"><img