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

Merge r1348:1350 from rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-09-08 14:27:28 +00:00
parent b4e5a3903b
commit e3c30f3227
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,9 @@ Optional vars:
<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="description" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#description'].dataPropertyStatements[0].data}" />
<%-- get years off role --%>
<c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/>
<c:if test="${! empty startYear}">
@ -96,7 +98,7 @@ Optional vars:
<c:otherwise><c:set var="name" value="unlabeled ${param.roleActivityLabel} to person relation"/></c:otherwise>
</c:choose>
<c:set var="name" value="unknown person"/>
<c:set var="label" value="${ ! empty individual.rdfsLabel ? individual.rdfsLabel : 'unlabled param.roleActivityLabel to person relation' }"/>
<c:set var="label" value="${ ! empty individual.rdfsLabel ? individual.rdfsLabel : 'unlabeled param.roleActivityLabel to person relation' }"/>
<c:set var="errorMsg" value="&nbsp;(unidentified person - please edit)"/>
<c:set var="uri" value=""/>
</c:otherwise>
@ -110,6 +112,8 @@ Optional vars:
</c:otherwise>
</c:choose>
<%-- only show error messages if logged in --%>
<c:if test="${ ! showSelfEdits}">
<c:set var="errorMsg" value=""/>
@ -120,12 +124,14 @@ Optional vars:
<c:when test="${!empty uri}">
<c:url var="olink" value="/entity"><c:param name="uri" value="${uri}"/></c:url>
<a href="<c:out value="${olink}"/>">${name}</a>&nbsp;${label}&nbsp;${startYear}${endYearVal} ${errorMsg}
<c:if test="${! empty description}">
<br />${description}
</c:if>
</c:when>
<c:otherwise>
<p:process><strong>${name}</strong> ${label}</p:process> ${errorMsg}
</c:otherwise>
</c:choose>
</c:choose>
</c:when>
<c:otherwise>
<c:out value="No predicate available for custom rendering ..."/>