From 5ed46b631b8765c503421c91110f7478addfc98e Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 20 May 2010 16:58:13 +0000 Subject: [PATCH] NIHVIVO-442. Fixed logout link in identity. Error was in URL generated in FreeMarkerHttpServlet. --- .../mannlib/vitro/webapp/controller/Controllers.java | 1 - .../controller/freemarker/ContactMailController.java | 4 +++- .../controller/freemarker/FreeMarkerHttpServlet.java | 9 +++++++-- .../vitro/webapp/controller/freemarker/Routes.java | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java index f71537512..96f4b47be 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java @@ -34,7 +34,6 @@ public class Controllers { public static final String SITE_ADMIN = "/siteAdmin"; public static final String LOGIN = "/siteAdmin"; - public static final String LOGOUT = "/siteAdmin"; public static final String EXPORT_RDF = "/export"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 21b9bb1ac..b98c85aa0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -26,7 +26,9 @@ import org.apache.log4j.Logger; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; public class ContactMailController extends FreeMarkerHttpServlet { - private static final Logger LOG = Logger.getLogger(ContactMailController.class); + + private static final long serialVersionUID = 1L; + private static final Logger LOG = Logger.getLogger(ContactMailController.class); private final static String CONFIRM_PAGE = "/thankyou.jsp"; private final static String ERR_PAGE = "/contact_err.jsp"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java index 255eeac6b..cd8561427 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java @@ -258,9 +258,14 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { urls.put("search", getUrl(Routes.SEARCH)); urls.put("termsOfUse", getUrl(Routes.TERMS_OF_USE, portalParam)); urls.put("login", getUrl(Routes.LOGIN)); - urls.put("logout", getUrl(Routes.LOGOUT)); - urls.put("siteAdmin", getUrl(Routes.SITE_ADMIN)); + Map logoutParams = new HashMap(); + logoutParams.put("home", "" + portalId); + logoutParams.put("loginSubmitMode", "Log Out"); + urls.put("logout", getUrl(Routes.LOGOUT, logoutParams)); + + urls.put("siteAdmin", getUrl(Routes.SITE_ADMIN)); + System.out.println("LOGOUT: " + urls.get("logout")); setSharedVariable("urls", urls); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/Routes.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/Routes.java index aa284cdd3..a8bdee43d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/Routes.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/Routes.java @@ -16,9 +16,9 @@ public class Routes { public static final String TERMS_OF_USE = "/termsOfUse"; // Put these under /admin/... - // Currently login, logout, and site admin are all the same page, but they don't have to be. + // Currently login and site admin are on the same page, but they don't have to be. public static final String LOGIN = "/siteAdmin"; - public static final String LOGOUT = "/siteAdmin"; + public static final String LOGOUT = "/login_process.jsp"; public static final String SITE_ADMIN = "/siteAdmin"; }