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

Merge to trunk. Fixing error when deleting properties on front end NIHVIVO-953

Browse source
This commit is contained in:
bdc34 2010-07-23 20:45:37 +00:00
parent 1ba2eda019
commit 59801b8dcb
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
webapp/web/templates/entity/entityMergedPropsList.jsp
View file

@ -199,21 +199,30 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
</c:if> </c:if>
<c:set var="collateByClass" value="<%=op.getCollateBySubclass()%>"/> <c:set var="collateByClass" value="<%=op.getCollateBySubclass()%>"/>
<c:if test="${collateByClass}" > <c:if test="${collateByClass}" >
<% System.out.println("doing collateByClass"); %>
<c:set var="collateClassesShownCount" value="0"/> <c:set var="collateClassesShownCount" value="0"/>
<c:set var="collateCurrentClass" value="_none"/> <c:set var="collateCurrentClass" value="_firstOne"/>
</c:if> </c:if>
<c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt"> <c:forEach items="${objProp.objectPropertyStatements}" var="objPropertyStmt">
<c:if test="${ collateByClass && collateCurrentClass!=objPropertyStmt.object.VClassURI}"> <% System.out.println("doing collateByClass"); %>
<c:if test="${ collateClassesShownCount > 0 }"> <c:set var="sameClass" value="false"/>
</ul></li><!-- collateClasses --> <c:forEach items="${objPropertyStmt.object.VClasses}" var="vclass">
</c:if> <c:if test="${ vclass.URI == collateCurrentClass }">
<c:set var="collateCurrentClass" value="${objPropertyStmt.object.VClassURI}" /> <c:set var="sameClass" value="true"/>
<c:set var="collateCurrentClassName" value="${objPropertyStmt.object.VClass.name}" /> </c:if>
<c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/> </c:forEach>
<li>
<h5 class="collate">${collateCurrentClassName}</h5> <c:if test="${ collateByClass && ( !sameClass || collateCurrentClass == '_firstOne') }">
<ul class='properties'><!-- collateClasses --> <c:if test="${ collateClassesShownCount > 0 }">
</c:if> </ul></li><!-- collateClasses -->
</c:if>
<c:set var="collateCurrentClass" value="${objPropertyStmt.object.VClassURI}" />
<c:set var="collateCurrentClassName" value="${objPropertyStmt.object.VClass.name}" />
<c:set var="collateClassesShownCount" value="${collateClassesShown + 1}"/>
<li>
<h5 class="collate">${collateCurrentClassName}</h5>
<ul class='properties'><!-- collateClasses -->
</c:if>
<li><span class="statementWrap"> <li><span class="statementWrap">
<c:set var="opStmt" value="${objPropertyStmt}" scope="request"/> <c:set var="opStmt" value="${objPropertyStmt}" scope="request"/>
<c:url var="propertyLink" value="/entity"> <c:url var="propertyLink" value="/entity">
@ -245,9 +254,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:if test="${empty editLinks}"><em class="nonEditable">(non-editable)</em></c:if> <c:if test="${empty editLinks}"><em class="nonEditable">(non-editable)</em></c:if>
</c:if> </c:if>
</span></li> </span></li>
</c:forEach> </c:forEach>
<c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul></li><!-- collate end --></c:if> <c:if test="${ collateByClass && collateClassesShownCount > 0 }"></ul></li><!-- collate end --></c:if>
<c:if test="${objRows > 0}"></ul></c:if> <c:if test="${objRows > 0}"></ul></c:if>
</div><!-- ${objProp.localName} --> </div><!-- ${objProp.localName} -->
</c:if> </c:if>
<% } else if (p instanceof DataProperty) { <% } else if (p instanceof DataProperty) {