From 1a604d6c50b9c6f6b38b097758b9a1eae3adf214 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 15 Jul 2010 17:56:19 +0000
Subject: [PATCH] In Investigator Role short view displays on person page,
 don't display a role label, since it's the same as the object property
 heading ("principal investigator", etc.). Do display on profile page for the
 activity, since there the role is listed under a generic "related role"
 property that doesn't reveal the nature of the role.

---
 productMods/templates/entity/roleShortView.jsp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 288564ee..aeca7c40 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -40,7 +40,9 @@
                             <c:when test="${!empty individual.objectPropertyMap['http://vivoweb.org/ontology/core#roleIn']}">
 					            <c:set var="roleActivity" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#roleIn'].objectPropertyStatements[0].object}" />
 					            <c:set var="name"  value="${roleActivity.name}"/> 
-					            <c:set var="label" value="${roleLabel}" /> 
+					            <%-- On the person page, it's redundant to display the role label in this case, since the object property
+					            label contains the same information. --%>
+					            <c:set var="label" value="${! empty param.roleLabelForPerson ? '' : individual.name}" /> 
                                 <c:set var="uri" value="${roleActivity.URI}"/>                                                                
                             </c:when>
  				            <c:otherwise><%-- this Role is not linked to anything yet; use name as a placeholder and add link to the Role so user can add more information --%>