NIHVIVO-2682 - changed list view so that if both an activity (roleIn) and an information resource (forInformationResource) are associated with the role then both will be displayed in the list view. (if only one or the other is present then that one will be displayed).

This commit is contained in:
stellamit 2011-06-17 15:48:10 +00:00
parent 6ee5771c01
commit 4fedd2e477

View file

@ -16,7 +16,11 @@
<#macro showRole statement> <#macro showRole statement>
<#local linkedIndividual> <#local linkedIndividual>
<#if statement.infoResource??> <#if statement.infoResource??>
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a> <#if statement.activity??>
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a> <a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
<#else>
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a>
</#if>
<#elseif statement.activity??> <#elseif statement.activity??>
<a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a> <a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
<#else> <#else>