From b9833f2d116a9e7adadbeb0aa2640c576d3a976b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 28 Sep 2010 15:34:26 +0000
Subject: [PATCH] Merge r1397:1399 from rel-1.1-maint

---
 .../entity/educationalTrainingShortView.jsp      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/productMods/templates/entity/educationalTrainingShortView.jsp b/productMods/templates/entity/educationalTrainingShortView.jsp
index 9fd87817..fe7774cd 100644
--- a/productMods/templates/entity/educationalTrainingShortView.jsp
+++ b/productMods/templates/entity/educationalTrainingShortView.jsp
@@ -64,15 +64,15 @@
                 
                 <%-- Build the output string --%>
                 <c:choose>
-                    <c:when test="${ ! empty degreeStr }">
-                        ${degreeStr}
-                        <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 test="${empty degreeStr && empty selectedOrganizationStr && empty degreeDeptOrSchool}">
+                        <a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>        
                     </c:when>
-                    <c:otherwise>
-                        <a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>
+                    <c:otherwise>                       
+                        <%= 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:choose>
             </c:when>