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

NIHVIVO-362 Merge from rel-1.0-maint branch: Fixed comma issues in position history custom short view that were observed while investigating this bug.

Browse source
This commit is contained in:
rjy7 2010-04-12 19:18:25 +00:00
parent 5c416fccb9
commit f3f1f1bc22
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
productMods/templates/entity/positionShortView.jsp
View file

@ -64,13 +64,18 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<%-- Hack to control extra spaces...should be done differently though. --%>
<c:if test="${!empty objName && !empty objLabel}" >
<c:set var="objLabel" value=" ${objLabel}" />
</c:if>
<c:choose> <c:choose>
<c:when test="${!empty objUri}"> <c:when test="${!empty objUri}">
<c:url var="objLink" value="/entity"><c:param name="uri" value="${objUri}"/></c:url> <c:url var="objLink" value="/entity"><c:param name="uri" value="${objUri}"/></c:url>
<a href="<c:out value="${objLink}"/>"><p:process>${objName}</p:process></a> <p:process>${objLabel} ${timeSpan}</p:process> <a href="<c:out value="${objLink}"/>"><p:process>${objName}</p:process></a><p:process>${objLabel}${timeSpan}</p:process>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:process><strong>${objName}</strong> ${objLabel} ${timeSpan}</p:process> <p:process><strong>${objName}</strong>${objLabel}${timeSpan}</p:process>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:when> </c:when>