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

Merge r1397:1399 from rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-09-28 15:34:26 +00:00
parent 9a918e911f
commit b9833f2d11
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,15 +64,15 @@
<%-- Build the output string --%> <%-- Build the output string --%>
<c:choose> <c:choose>
<c:when test="${ ! empty degreeStr }"> <c:when test="${empty degreeStr && empty selectedOrganizationStr && empty degreeDeptOrSchool}">
${degreeStr} <a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>
<c:if test="${ ! empty selectedOrganizationStr}">, ${selectedOrganizationStr}</c:if>
<c:if test="${ ! empty degreeDeptOrSchool}">, ${degreeDeptOrSchool}</c:if>
<c:if test="${ ! empty year }">, ${year}</c:if>
<c:if test="${ ! empty degreeSupplementalInfo }">, ${degreeSupplementalInfo}</c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a> <%= StringUtils.join(", ", (String) pageContext.getAttribute("degreeStr"),
(String) pageContext.getAttribute("selectedOrganizationStr"),
(String) pageContext.getAttribute("degreeDeptOrSchool"),
(String) pageContext.getAttribute("year"),
(String) pageContext.getAttribute("degreeSupplementalInfo") ) %>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:when> </c:when>