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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-22 14:48:02 -05:00
commit cf1f4854c6
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
View file

@ -28,25 +28,16 @@
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.
-->
<#if statement.roleTypeLabel?has_content>
<#assign roleTypeLabel = statement.roleTypeLabel >
<#else>
<#assign roleTypeLabel = "" >
<#assign roleTypeLabel = statement.roleTypeLabel!"" >
</#if>
<#if statement.roleLabel?has_content>
<#if statement.roleLabel?lower_case?replace(" role", "") != roleTypeLabel?lower_case?replace(" role", "")>
${statement.roleLabel?replace(" Role", "")}
</#if>
<#elseif (! property.collatedBySubclass ) && roleTypeLabel?has_content>
<#if statement.roleLabel??>
${statement.roleLabel?replace(" Role", "")?replace(" role","")}
<#elseif !property.collatedBySubclass >
${roleTypeLabel?replace(" Role", "")}
</#if>
</#local>
${linkedIndividual}&nbsp;${roleLabel!}&nbsp;<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>