diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java index f391bd9b7..0c8b237c8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java @@ -15,8 +15,11 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; + import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import freemarker.cache.WebappTemplateLoader; @@ -60,11 +63,11 @@ public class StartupStatusDisplayFilter implements Filter { return; } - displayStartupStatus(resp); + displayStartupStatus(req, resp); statusAlreadyDisplayed = true; } - private void displayStartupStatus(ServletResponse resp) throws IOException, + private void displayStartupStatus(ServletRequest req, ServletResponse resp) throws IOException, ServletException { HttpServletResponse hResp = (HttpServletResponse) resp; @@ -73,8 +76,16 @@ public class StartupStatusDisplayFilter implements Filter { bodyMap.put("status", ss); bodyMap.put("showLink", !isFatal()); bodyMap.put("contextPath", getContextPath()); - bodyMap.put("applicationName", getApplicationName()); - + bodyMap.put("applicationName", getApplicationName()); + + HttpServletRequest httpreq = (HttpServletRequest) req; + String path = httpreq.getRequestURI(); + String query = httpreq.getQueryString(); + if( !StringUtils.isEmpty( query )){ + query = "?" + query; + } + bodyMap.put("url", path+query ); + hResp.setStatus(SC_INTERNAL_SERVER_ERROR); Template tpl = loadFreemarkerTemplate(); tpl.process(bodyMap, hResp.getWriter()); diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl index a8db53dc1..ff1351e5a 100644 --- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl +++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl @@ -100,7 +100,7 @@ <#-- If there were no fatal errors, let them go forward from here. --> <#if showLink> -

Continue

+

Continue