From 201265fc4bb2c91cbd73d8365af0d481e8a82022 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 7 Feb 2011 15:52:52 +0000 Subject: [PATCH] Added template model methods to get first value of data properties and first statement of data props and uncollated object props. Improved efficiency of moniker/preferred title code in person template. Added order by statement to default list view queries so order is not random. --- .../body/individual/individual--foaf-person.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 86f557ab..5fd89ced 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -103,14 +103,14 @@ <#-- Moniker / Preferred Title --> <#-- Use Preferred Title over Moniker if it is populated --> - <#assign hasPreferredTitle = p.hasStatements(propertyGroups, "${core}preferredTitle") /> - <#if hasPreferredTitle || individual.moniker?has_content> + <#assign preferredTitle = (propertyGroups.getProperty("${core}preferredTitle").firstValue)! /> + <#assign moniker = individual.moniker> + <#if preferredTitle?has_content || moniker?has_content> - <#if hasPreferredTitle> - <#assign preferredTitle = propertyGroups.getProperty("${core}preferredTitle")! /> - ${preferredTitle.statements[0].value} + <#if preferredTitle?has_content> + ${preferredTitle} <#else> - ${individual.moniker} + ${moniker}