Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/VIVO into maint-rel-1.6
This commit is contained in:
commit
291d04c44f
25 changed files with 1312 additions and 548 deletions
|
@ -16,7 +16,7 @@
|
|||
<#macro showRole statement>
|
||||
<#local linkedIndividual>
|
||||
<#if statement.presentation??>
|
||||
<a href="${profileUrl(statement.uri("presentation"))}" title="${i18n().presentation_name}">${statement.presentationLabel!statement.presentationName}</a>
|
||||
<a href="${profileUrl(statement.uri("presentation"))}" title="${i18n().presentation_name}">${statement.presentationLabel!statement.presentationName!""}</a>
|
||||
<#else>
|
||||
<#-- This shouldn't happen, but we must provide for it -->
|
||||
<a href="${profileUrl(statement.uri("role"))}" title="${i18n().missing_presentation}">${i18n().missing_presentation}</a>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue