From 06f13be16d4f6ffdf86dad13444f0394528ab418 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 6 Oct 2010 21:52:12 +0000
Subject: [PATCH] Fixing problem with collation. NIHVIVO-1190

---
 .../entity/entityMergedPropsListUngrouped.jsp | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp b/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
index a68e2f705..c89cde5ee 100644
--- a/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
+++ b/webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
@@ -153,8 +153,16 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 						<c:set var="collateClassesShownCount" value="0"/>
 						<c:set var="collateCurrentClass" value="_none"/>				
 					</c:if>
-					<c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt">															
-						<c:if test="${ collateByClass && collateCurrentClass!=objPropertyStmt.object.VClassURI}">						   
+					<c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt">
+										
+					    <c:set var="sameClass" value="false"/>
+                        <c:forEach items="${objPropertyStmt.object.VClasses}" var="vclass">
+                            <c:if test="${ vclass.URI == collateCurrentClass }">
+                                <c:set var="sameClass" value="true"/>                                                                           
+                            </c:if>                             
+                        </c:forEach>
+																				
+						<c:if test="${ collateByClass && ( !sameClass || collateCurrentClass == '_firstOne') }">						   
 		            		<c:if test="${ collateClassesShownCount > 0 }">
 		            			</ul></li><!-- collateClasses -->
 		            		</c:if>
@@ -166,26 +174,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 		            		<ul class='properties'><!-- collateClasses -->
 		            	</c:if>
 
-						<c:if test="${stmtCounter == displayLimit}"><!-- set up toggle div and expandable continuation div -->
-							<c:if test="${ collateByClass }"> </ul></li></c:if>
-							<c:if test="${ ! collateByClass }"> </ul></c:if>  							
-  		                	<c:set var="hiddenDivCount" value="${hiddenDivCount+1}"/>
-							<c:url var="themePath" value="/${themeDir}site_icons" />
-									
-			               <div class="navlinkblock ">
-			                 <span class="entityMoreSpan">
-			                   <c:out value='${objRows - stmtCounter}' />
-			                   <c:choose>
-			                       <c:when test='${displayLimit==0}'> entries</c:when>
-			                       <c:otherwise> more</c:otherwise>
-			                   </c:choose>
-			                 </span>
-			               
-			                 <div class="extraEntities">
-			                 <c:if test="${ collateByClass }"> <li></c:if>
-							 <ul class="properties">
-			              		 
-						</c:if>
      					<li>
 	     					<span class="statementWrap">
 	     					<c:set var="opStmt" value="${objPropertyStmt}" scope="request"/>
@@ -223,10 +211,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 					</c:forEach>
 					<c:if test="${objRows > 0}"></ul></c:if>
 					<c:if test="${ collateClassesShownCount > 0 }"></li><!-- collateClasses 2 --></c:if>
-					<c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul><!-- collate end --></c:if>										
-   					<c:if test="${ stmtCounter > displayLimit}">
-   					</div><%-- navlinkblock --%>
-   					</div><%-- extraEntities --%></c:if>
+					<c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul><!-- collate end --></c:if>										   					   					   				
  				</div><!-- ${objProp.localNameWithPrefix} -->
  			</c:if>
 <%		} else if (p instanceof DataProperty) {