From 821da68e85fbd3a6a42b3d0799e106adcf7871d0 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 21 Jul 2010 15:28:51 +0000
Subject: [PATCH] Merging from branch, changing role short view to not display
 role names if there are none. NIHVIVO-836

---
 productMods/templates/entity/roleShortView.jsp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index aeca7c40..8dc1617a 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -21,9 +21,7 @@
 	<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%>
  		<c:choose>
 			<c:when test="${!empty predicateUri}">
-			
-				<c:set var="roleLabel" value="${! empty param.roleLabelForPerson ? param.roleLabelForPerson : individual.name}"/>
-				
+											
 			    <%-- get years off role --%>
 				<c:set var="startYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#startYear'].dataPropertyStatements[0].data}"/>
                 <c:if test="${not empty startYear}">
@@ -39,10 +37,11 @@
 					    <c:choose>
                             <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="name"  value="${roleActivity.name}"/> 					            
 					            <%-- 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="label" value="${! empty param.roleLabelForPerson ? '' : (! empty individual.rdfsLabel ? individual.rdfsLabel: '')}" /> 
+					            					            
                                 <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 --%>
@@ -68,7 +67,7 @@
 				    		<c:when test="${!empty individual.objectPropertyMap[ param.roleToPersonPredicate ]}">				    		
 				    		    <c:set var="person" value="${individual.objectPropertyMap[ param.roleToPersonPredicate ].objectPropertyStatements[0].object}" />
 					    		<c:set var="name" value="${person.name}"/>
-					    		<c:set var="label" value="${roleLabel}" />
+					            <c:set var="label" value="${! empty individual.rdfsLabel ? individual.rdfsLabel :(! empty param.roleLabelForPerson ? param.roleLabelForPerson : '' )}"/>					    							    		
                                 <c:set var="uri" value="${person.URI}"/>
 					    	</c:when>