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

NIHVIVO-2325 Display core:hasPreseneterRole date as non-interval

Browse source
This commit is contained in:
ryounes 2011-03-28 22:25:07 +00:00
parent 12e68942fc
commit c4d0143b49
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/web/edit/forms/propDelete.jsp
View file

@ -117,12 +117,14 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
String statementDisplay = null; String statementDisplay = null;
if (! statement.isEmpty()) { if (! statement.isEmpty()) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("statement", statement);
/* Some propStatements (propStatement-educationalTraining.ftl) make reference to the individual, /* 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. * this becomes more common, add it here instead.
*/ */
//map.put("individual", new IndividualTemplateModel(subject, vreq)); //map.put("individual", new IndividualTemplateModel(subject, vreq));
map.put("statement", statement);
map.putAll(FreemarkerHttpServlet.getDirectives()); map.putAll(FreemarkerHttpServlet.getDirectives());
map.putAll(FreemarkerHttpServlet.getMethods()); map.putAll(FreemarkerHttpServlet.getMethods());
ServletContext context = getServletContext(); ServletContext context = getServletContext();

2
webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
View file

@ -38,7 +38,7 @@
<@collatedObjectPropertyList property editable template /> <@collatedObjectPropertyList property editable template />
<#else> <#-- uncollated --> <#else> <#-- uncollated -->
<#-- We pass property.statements and property.template even though we are also <#-- 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 --> doesn't necessarily use property.statements and property.template -->
<@objectPropertyList property editable property.statements template /> <@objectPropertyList property editable property.statements template />
</#if> </#if>