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

NIHVIVO-3270 Instead of storing request-specific URLs in the FreemarkerConfiguration (where they become global), create a "urls" variable in the body map that includes both request-specific and context-general values, and that masks that "urls" variable in the config.

Browse source
This commit is contained in:
j2blake 2012-03-06 21:39:24 +00:00
parent d54cdb2a82
commit ca844e91a2
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -340,40 +340,36 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
/**
* Define the request-specific URLs that are accessible to the templates.
* @param VitroRequest vreq
* Merge it with the context-specific URLs from the configuration, because
* this map will mask that one.
*/
private void setRequestUrls(VitroRequest vreq) {
private Map<String, Object> buildRequestUrls(VitroRequest vreq) {
Map<String, Object> requestUrls = new HashMap<String, Object>();
FreemarkerConfiguration config = (FreemarkerConfiguration)vreq.getAttribute("freemarkerConfig");
TemplateModel urlModel = config.getSharedVariable("urls");
try {
@SuppressWarnings("unchecked")
Map<String, Object> urls = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(urlModel);
Map<String, Object> configUrls = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(urlModel);
requestUrls.putAll(configUrls);
// This is request-specific because email can be configured
// and de-configured in the application interface.
if (FreemarkerEmailFactory.isConfigured(vreq)) {
urls.put("contact", UrlBuilder.getUrl(Route.CONTACT));
} else {
urls.remove("contact"); // clear value from a previous request
requestUrls.put("contact", UrlBuilder.getUrl(Route.CONTACT));
}
urls.put("currentPage", getCurrentPageUrl(vreq));
urls.put("referringPage", getReferringPageUrl(vreq));
requestUrls.put("currentPage", getCurrentPageUrl(vreq));
requestUrls.put("referringPage", getReferringPageUrl(vreq));
if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_OWN_ACCOUNT.ACTIONS)) {
urls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
} else {
urls.remove("myAccount"); // clear value from a previous request
requestUrls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
}
config.setSharedVariable("urls", urls);
} catch (TemplateModelException e) {
log.error(e, e);
}
return requestUrls;
}
private String getCurrentPageUrl(HttpServletRequest request) {
@ -424,7 +420,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
// This may be overridden by the body data model received from the subcontroller.
map.put("title", getTitle(vreq.getAppBean().getApplicationName(), vreq));
setRequestUrls(vreq);
map.put("urls", buildRequestUrls(vreq));
map.put("menu", getDisplayModelMenu(vreq));