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

NIHVIVO-1304 Allow a widget assets template to be absent without generating an error.

Browse source
This commit is contained in:
rjy7 2010-11-11 01:19:56 +00:00
parent bb614c833b
commit 7ad822efce
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
View file

@ -2,6 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.web.widgets; package edu.cornell.mannlib.vitro.webapp.web.widgets;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -12,6 +13,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.TemplateProcessingHelper; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.TemplateProcessingHelper;
import freemarker.cache.TemplateLoader;
import freemarker.core.Environment; import freemarker.core.Environment;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.TemplateHashModel; import freemarker.template.TemplateHashModel;
@ -46,8 +48,20 @@ public abstract class Widget {
public String doAssets() { public String doAssets() {
String templateName = "widget-" + name + "-assets.ftl"; String templateName = "widget-" + name + "-assets.ftl";
// Allow the assets template to be absent without generating an error.
TemplateLoader templateLoader = env.getConfiguration().getTemplateLoader();
try {
if ( templateLoader.findTemplateSource(templateName) == null ) {
return "";
}
} catch (IOException e) {
log.error("Error finding template source", e);
}
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
TemplateHashModel dataModel = env.getDataModel(); TemplateHashModel dataModel = env.getDataModel();
try { try {
map.put("stylesheets", dataModel.get("stylesheets")); map.put("stylesheets", dataModel.get("stylesheets"));
map.put("scripts", dataModel.get("scripts")); map.put("scripts", dataModel.get("scripts"));
@ -55,6 +69,7 @@ public abstract class Widget {
} catch (TemplateModelException e) { } catch (TemplateModelException e) {
log.error("Error getting asset values from data model."); log.error("Error getting asset values from data model.");
} }
return helper.processTemplateToString(templateName, map); return helper.processTemplateToString(templateName, map);
} }

2
webapp/web/templates/freemarker/body/test.ftl
View file

@ -6,4 +6,4 @@
<@widget name="test" /> <@widget name="test" />
${stylesheets.add("/css/testfrombody.css")}