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

NIHVIVO-442. Fixed logout link in identity. Error was in URL generated in FreeMarkerHttpServlet.

Browse source
This commit is contained in:
rjy7 2010-05-20 16:58:13 +00:00
parent dbafad9e9e
commit 5ed46b631b
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
View file

@ -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";

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
View file

@ -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";

9
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
View file

@ -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<String, String> logoutParams = new HashMap<String, String>();
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);
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/Routes.java
View file

@ -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";
}