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

Changing startup status to use requested url for continue link.

Browse source
This commit is contained in:
briancaruso 2012-06-19 15:46:20 +00:00
parent 4bf0729f04
commit 0324d89561
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
View file

@ -15,8 +15,11 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
import freemarker.cache.WebappTemplateLoader; import freemarker.cache.WebappTemplateLoader;
@ -60,11 +63,11 @@ public class StartupStatusDisplayFilter implements Filter {
return; return;
} }
displayStartupStatus(resp); displayStartupStatus(req, resp);
statusAlreadyDisplayed = true; statusAlreadyDisplayed = true;
} }
private void displayStartupStatus(ServletResponse resp) throws IOException, private void displayStartupStatus(ServletRequest req, ServletResponse resp) throws IOException,
ServletException { ServletException {
HttpServletResponse hResp = (HttpServletResponse) resp; HttpServletResponse hResp = (HttpServletResponse) resp;
@ -75,6 +78,14 @@ public class StartupStatusDisplayFilter implements Filter {
bodyMap.put("contextPath", getContextPath()); 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); hResp.setStatus(SC_INTERNAL_SERVER_ERROR);
Template tpl = loadFreemarkerTemplate(); Template tpl = loadFreemarkerTemplate();
tpl.process(bodyMap, hResp.getWriter()); tpl.process(bodyMap, hResp.getWriter());

2
webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
View file

@ -100,7 +100,7 @@
<#-- If there were no fatal errors, let them go forward from here. --> <#-- If there were no fatal errors, let them go forward from here. -->
<#if showLink> <#if showLink>
<p><a href="." title="continue">Continue</a></p> <p><a href="${url}" title="continue">Continue</a></p>
</#if> </#if>
</#if> </#if>