litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging from branch, changing role short view to not display role names if there are none. NIHVIVO-836

Browse source
This commit is contained in:
bdc34 2010-07-21 15:28:51 +00:00
parent 6e44ac29b6
commit 821da68e85
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
productMods/templates/entity/roleShortView.jsp
View file

@ -22,8 +22,6 @@
<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}">
@ -42,7 +40,8 @@
<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>