From 7cb608818a8ff8478ae4724118696643375d4720 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 3 Oct 2012 14:41:14 +0000 Subject: [PATCH] merging 4292 to the trunk --- .../individual/propStatement-relatedRole.ftl | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index c9c946e1..e198cd01 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl @@ -25,18 +25,27 @@ - <#-- Generally roles are assigned a label when entered through a custom form. Investigator and its subclasses do not, - so use the type label instead if not collated by subclass. --> + <#-- + Generally roles are assigned a label when entered through a custom form. Investigator and its subclasses do not, + so use the type label instead if not collated by subclass. + --> <#local roleLabel> - <#-- Display, e.g., "Principal Investigator" for "Principal Investigator Role", - "Editor" for "Editor Role". - This information is redundant if the property is collated, since it appears in the subclass label. --> + <#-- + Display, e.g., "Principal Investigator" for "Principal Investigator Role", "Editor" for "Editor Role". + This information is redundant if the property is collated, since it appears in the subclass label. + --> + <#if statement.roleTypeLabel?has_content> + <#assign roleTypeLabel = statement.roleTypeLabel > + <#else> + <#assign roleTypeLabel = "" > + <#if statement.roleLabel?has_content> - <#if statement.roleLabel?lower_case?replace(" role", "") != statement.roleTypeLabel?lower_case?replace(" role", "")> + <#if statement.roleLabel?lower_case?replace(" role", "") != roleTypeLabel?lower_case?replace(" role", "")> ${statement.roleLabel?replace(" Role", "")} - <#elseif (! property.collatedBySubclass ) && statement.roleTypeLabel?has_content>${statement.roleTypeLabel?replace(" Role", "")} + <#elseif (! property.collatedBySubclass ) && roleTypeLabel?has_content> + ${roleTypeLabel?replace(" Role", "")}