From f3f1f1bc22d5137f848896fb64053131a0db4f20 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 12 Apr 2010 19:18:25 +0000
Subject: [PATCH] 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.

---
 productMods/templates/entity/positionShortView.jsp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/productMods/templates/entity/positionShortView.jsp b/productMods/templates/entity/positionShortView.jsp
index 019d8574..26d75d99 100644
--- a/productMods/templates/entity/positionShortView.jsp
+++ b/productMods/templates/entity/positionShortView.jsp
@@ -64,13 +64,18 @@
 				            </c:otherwise>
 				        </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:when test="${!empty objUri}">
 					            <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:otherwise>
-				                <p:process><strong>${objName}</strong> ${objLabel} ${timeSpan}</p:process> 
+				                <p:process><strong>${objName}</strong>${objLabel}${timeSpan}</p:process> 
 				            </c:otherwise>
 		        		</c:choose>
 				    </c:when>