From 4fedd2e47738080ebfbd2ce2ace04fb30221f579 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 17 Jun 2011 15:48:10 +0000
Subject: [PATCH] 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).

---
 .../partials/individual/propStatement-hasEditReviewRole.ftl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
index a5cf8650..c003fd20 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
@@ -16,7 +16,11 @@
 <#macro showRole statement>
     <#local linkedIndividual>
         <#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??>
             <a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
         <#else>