[gatein-commits] gatein SVN: r7637 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui.
Author: mwringe
Date: 2011-10-03 23:03:58 -0400 (Mon, 03 Oct 2011)
New Revision: 7637
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
Log:
JBEPP-1104: revert patch until it can be fixed properly in the case where the login link
is used.
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
===================================================================
---
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-10-03
23:16:27 UTC (rev 7636)
+++
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-10-04
03:03:58 UTC (rev 7637)
@@ -6,7 +6,8 @@
jsmanager.importJavascript('eXo.portal.UIPortalControl');
jsmanager.addCustomizedOnLoadScript('document.getElementById("UIPortalComponentLogin").username.focus();');
HttpSession session = rcontext.getRequest().getSession();
- String initialURI = rcontext.getRequestParameter("initialURI");
+ String requestPath = rcontext.getInitialURI();
+ //session.setAttribute("initialURI", requestPath);
%>
<div class="UILoginForm">
<div class="LoginDecorator">
@@ -22,7 +23,7 @@
<div class="LoginDecoratorBackground">
<div class="LoginDetailBox">
<form class="UIForm" id="$uicomponent.id"
name="loginForm" action="<%= rcontext.getRequestContextPath() +
"/login"%>" method="post" style="margin: 0px;">
- <input type="hidden" name="initialURI"
value="<%=initialURI %>"/>
+ <input type="hidden" name="initialURI"
value="<%=requestPath %>"/>
<div class="VerticalLayout">
<table class="UIFormGrid">
<tr class="UserNameField">