litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed forcing of portal on login/logout

Browse source
This commit is contained in:
nac26 2010-08-05 17:59:43 +00:00
parent 3b392c7eba
commit d3b8b89de4
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -491,16 +491,14 @@ public class Authenticate extends FreemarkerHttpServlet {
/** What's the URL for the login screen? */ /** What's the URL for the login screen? */
private String getLoginScreenUrl(HttpServletRequest request) { private String getLoginScreenUrl(HttpServletRequest request) {
String contextPath = request.getContextPath(); String contextPath = request.getContextPath();
String urlParams = "?home=" + getPortalIdString(request) String urlParams = "?login=block";
+ "&login=block";
return contextPath + Controllers.LOGIN + urlParams; return contextPath + Controllers.LOGIN + urlParams;
} }
/** What's the URL for the site admin screen? */ /** What's the URL for the site admin screen? */
private String getSiteAdminUrl(HttpServletRequest request) { private String getSiteAdminUrl(HttpServletRequest request) {
String contextPath = request.getContextPath(); String contextPath = request.getContextPath();
String urlParams = "?home=" + getPortalIdString(request) String urlParams = "?login=block";
+ "&login=block";
return contextPath + Controllers.SITE_ADMIN + urlParams; return contextPath + Controllers.SITE_ADMIN + urlParams;
} }

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
View file

@ -183,16 +183,14 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
/** What's the URL for this servlet? */ /** What's the URL for this servlet? */
private String getAuthenticateUrl(HttpServletRequest request) { private String getAuthenticateUrl(HttpServletRequest request) {
String contextPath = request.getContextPath(); String contextPath = request.getContextPath();
String urlParams = "?home=" + getPortalIdString(request) String urlParams = "?login=block";
+ "&login=block";
return contextPath + "/authenticate" + urlParams; return contextPath + "/authenticate" + urlParams;
} }
/** What's the URL for this servlet, with the cancel parameter added? */ /** What's the URL for this servlet, with the cancel parameter added? */
private String getCancelUrl(HttpServletRequest request) { private String getCancelUrl(HttpServletRequest request) {
String contextPath = request.getContextPath(); String contextPath = request.getContextPath();
String urlParams = "?home=" + getPortalIdString(request) String urlParams = "?login=block&cancel=true";
+ "&login=block&cancel=true";
return contextPath + "/authenticate" + urlParams; return contextPath + "/authenticate" + urlParams;
} }