Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2014-12-18 22:43:42 -0500
committerWinston Prakash2014-12-18 22:43:42 -0500
commit6f9259819a82d62d1bab96ce9eee2e807e81a688 (patch)
tree09ff46031fd6cdb93e3899e2bae8d602cd8d3072 /hudson-core/src/main/resources/hudson
parent04fcc84fb098c0c4c70a877e8ba047084bb4b244 (diff)
downloadorg.eclipse.hudson.core-6f9259819a82d62d1bab96ce9eee2e807e81a688.tar.gz
org.eclipse.hudson.core-6f9259819a82d62d1bab96ce9eee2e807e81a688.tar.xz
org.eclipse.hudson.core-6f9259819a82d62d1bab96ce9eee2e807e81a688.zip
Bug Fix: 445550 - Incomplete loading of Hudson dashboard page
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/loginError.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly4
2 files changed, 3 insertions, 3 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/loginError.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/loginError.jelly
index adab65be..36f3ccde 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/loginError.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/loginError.jelly
@@ -34,7 +34,7 @@
<div style="margin: 2em; text-align:center; color:red; font-weight:bold">
${%Invalid login information. Please try again.}
<br/>
- <a href="login?from=${request.session.getAttribute('from')}">${%Try again}</a>
+ <a href="login?from=${h.getSessionAttribute(request, 'from')}">${%Try again}</a>
</div>
<div align="middle">
<div style="margin-top:2em; color:gray; width:20em">
diff --git a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
index 13d28110..8888d6e3 100644
--- a/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
+++ b/hudson-core/src/main/resources/hudson/security/SecurityRealm/loginLink.jelly
@@ -19,12 +19,12 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
<j:invokeStatic var="fromEncoded" className="java.net.URLEncoder" method="encode">
- <j:arg value="${if (request.session.attribute('from')!=null) request.session.getAttribute('from'); else if (request.getParameter('from')!=null) request.getParameter('from'); else if (request.requestURI=='/loginError' || request.requestURI=='/login') '/'; else request.requestURI;}"/>
+ <j:arg value="${if (h.getSessionAttribute(request, 'from') !=null) h.getSessionAttribute(request, 'from'); else if (request.getParameter('from')!=null) request.getParameter('from'); else if (request.requestURI=='/loginError' || request.requestURI=='/login') '/'; else request.requestURI;}"/>
<j:arg value="UTF-8"/>
</j:invokeStatic>
- <j:set var="from" value="${if (request.session.attribute('from')!=null) request.session.getAttribute('from'); else if (request.getParameter('from')!=null) request.getParameter('from'); else if (request.requestURI=='/loginError' || request.requestURI=='/login') '/'; else request.requestURI;}" />
+ <j:set var="from" value="${if (h.getSessionAttribute(request, 'from') !=null) h.getSessionAttribute(request, 'from'); else if (request.getParameter('from')!=null) request.getParameter('from'); else if (request.requestURI=='/loginError' || request.requestURI=='/login') '/'; else request.requestURI;}" />
<script type="text/javascript">

Back to the top