diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DescribeDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DescribeDirective.java index 42ca3b606..a174802ad 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DescribeDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DescribeDirective.java @@ -81,14 +81,8 @@ public class DescribeDirective extends BaseTemplateDirectiveModel { Map map = new HashMap(); map.put("var", varName); map.put("methods", methodDisplayNames); - - try { - map.put("stylesheets", dataModel.get("stylesheets")); - } catch (TemplateModelException e) { - log.error("Error getting value of stylesheets variable from data model."); - } - helper.writeDump("describe.ftl", map, varName); + helper.writeDump("describe.ftl", map, varName, dataModel); } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpAllDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpAllDirective.java index 0e6087bda..55813b2ed 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpAllDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpAllDirective.java @@ -73,13 +73,7 @@ public class DumpAllDirective extends BaseTemplateDirectiveModel { map.put("methods", methods); map.put("containingTemplate", env.getTemplate().getName()); - try { - map.put("stylesheets", dataModel.get("stylesheets")); - } catch (TemplateModelException e) { - log.error("Error getting value of stylesheets variable from data model."); - } - - helper.writeDump("dumpAll.ftl", map, "template data model"); + helper.writeDump("dumpAll.ftl", map, "template data model", dataModel); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpDirective.java index 358c5d2ed..5713e911e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpDirective.java @@ -49,15 +49,8 @@ public class DumpDirective extends BaseTemplateDirectiveModel { DumpHelper helper = new DumpHelper(env); Map map = new HashMap(); map.put("var", helper.getVariableDump(var)); - - TemplateHashModel dataModel = env.getDataModel(); - try { - map.put("stylesheets", dataModel.get("stylesheets")); - } catch (TemplateModelException e) { - log.error("Error getting value of stylesheets variable from data model."); - } - helper.writeDump("dump.ftl", map, var); + helper.writeDump("dump.ftl", map, var, env.getDataModel()); } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpHelper.java index 50dbee4fd..dfa3de49d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/DumpHelper.java @@ -125,7 +125,17 @@ public class DumpHelper { return map; } - public void writeDump(String templateName, Map map, String modelName) { + public void writeDump(String templateName, Map map, String modelName, TemplateHashModel dataModel) { + + // Add objects to data model of calling template that are needed by + // dump templates. + try { + map.put("stylesheets", dataModel.get("stylesheets")); + map.put("urls", dataModel.get("urls")); + } catch (TemplateModelException e) { + log.error("Error getting values from data model."); + } + String output = BaseTemplateDirectiveModel.processTemplateToString(templateName, map, env); Writer out = env.getOut(); try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/HelpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/HelpDirective.java index 04ad7af0c..6b5091248 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/HelpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/dump/HelpDirective.java @@ -78,15 +78,9 @@ public class HelpDirective extends BaseTemplateDirectiveModel { Map map = new HashMap(); map.put("help", help); map.put("type", type); - - try { - map.put("stylesheets", dataModel.get("stylesheets")); - } catch (TemplateModelException e) { - log.error("Error getting value of stylesheets variable from data model."); - } DumpHelper helper = new DumpHelper(env); - helper.writeDump("help.ftl", map, name); + helper.writeDump("help.ftl", map, name, dataModel); } diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl index 6498ee85b..a3f6144be 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl @@ -8,6 +8,5 @@ ${var} -<#if stylesheets??> - ${stylesheets.add('')} - +${stylesheets.add('')} + diff --git a/webapp/web/templates/freemarker/body/partials/dump/dumpAll.ftl b/webapp/web/templates/freemarker/body/partials/dump/dumpAll.ftl index dad5e6436..fc86860ce 100644 --- a/webapp/web/templates/freemarker/body/partials/dump/dumpAll.ftl +++ b/webapp/web/templates/freemarker/body/partials/dump/dumpAll.ftl @@ -33,6 +33,4 @@ -<#if stylesheets??> - ${stylesheets.add('')} - \ No newline at end of file +${stylesheets.add('')}