From c4d0143b49d6d1e9846e09e4817e807e38192cdb Mon Sep 17 00:00:00 2001 From: ryounes Date: Mon, 28 Mar 2011 22:25:07 +0000 Subject: [PATCH] NIHVIVO-2325 Display core:hasPreseneterRole date as non-interval --- webapp/web/edit/forms/propDelete.jsp | 6 ++++-- .../freemarker/body/partials/individual/lib-properties.ftl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp index 026e3d011..985ac5b37 100644 --- a/webapp/web/edit/forms/propDelete.jsp +++ b/webapp/web/edit/forms/propDelete.jsp @@ -117,12 +117,14 @@ public WebappDaoFactory getUnfilteredDaoFactory() { String statementDisplay = null; if (! statement.isEmpty()) { Map map = new HashMap(); + map.put("statement", statement); + /* Some propStatements (propStatement-educationalTraining.ftl) make reference to the individual, - * but instead of adding it to the data model we'll test in the template for non-existence. IF + * but instead of adding it to the data model we'll test in the template for non-existence. If * this becomes more common, add it here instead. */ //map.put("individual", new IndividualTemplateModel(subject, vreq)); - map.put("statement", statement); + map.putAll(FreemarkerHttpServlet.getDirectives()); map.putAll(FreemarkerHttpServlet.getMethods()); ServletContext context = getServletContext(); diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index e0c12a315..49be5bd0b 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -38,7 +38,7 @@ <@collatedObjectPropertyList property editable template /> <#else> <#-- uncollated --> <#-- We pass property.statements and property.template even though we are also - passing property, because objecctPropertyList can get other values, and + passing property, because objectPropertyList can get other values, and doesn't necessarily use property.statements and property.template --> <@objectPropertyList property editable property.statements template />