Fixed object property sorting on individual page for default list view. NIHVIVO-3415
Removed unused domainEntitySortField and rangeEntitySortField from ObjectProperty. Added rangeEntitySortField back to property_retry.jsp.
This commit is contained in:
briancaruso
parent
ceaf27a713
commit
9b30ecdcb1
8 changed files with 172 additions and 169 deletions
|
|
@ -3,9 +3,9 @@
|
|||
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
|
||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
||||
|
||||
<%-- colspan set to 4 in PropertyRetryController.java --%>
|
||||
<%-- colspan set to 5 in PropertyRetryController.java --%>
|
||||
<tr class="editformcell">
|
||||
<td valign="top" colspan="1">
|
||||
<td valign="top" colspan="2">
|
||||
<b>Parent property</b><br/><br/>
|
||||
<select name="ParentURI"><form:option name="ParentURI"/></select>
|
||||
</td>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td style="vertical-align:bottom;" valign="bottom" colspan="1">
|
||||
<td style="vertical-align:bottom;" valign="bottom" colspan="2">
|
||||
<b>Local name for property*</b>
|
||||
<c:choose>
|
||||
<c:when test="${_action eq 'update'}">
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td style="vertical-align:bottom;" valign="bottom" colspan="1">
|
||||
<td style="vertical-align:bottom;" valign="bottom" colspan="2">
|
||||
<b>Optional: Inverse property local name</b>
|
||||
<c:choose>
|
||||
<c:when test="${_action eq 'update'}">
|
||||
|
|
@ -106,14 +106,14 @@
|
|||
<b>Domain class</b><br />
|
||||
<select name="DomainVClassURI"><form:option name="DomainVClassURI"/></select>
|
||||
</td>
|
||||
<td valign="top" colspan="2">
|
||||
<td valign="top" colspan="3">
|
||||
<b>Range class</b><br />
|
||||
<select name="RangeVClassURI" ><form:option name="RangeVClassURI"/></select>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="top" colspan="4">
|
||||
<td valign="top" colspan="5">
|
||||
<b>Public Description</b> for front-end users, as it will appear on editing forms<br/>
|
||||
<textarea name="PublicDescription"><form:value name="PublicDescription"/></textarea>
|
||||
<c:set var="PublicDescriptionError"><form:error name="PublicDescription"/></c:set>
|
||||
|
|
@ -122,48 +122,6 @@
|
|||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${transitive}">
|
||||
<input name="Transitive" type="checkbox" value="TRUE" checked="checked"/>transitive
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Transitive" type="checkbox" value="TRUE"/>transitive
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${symmetric}">
|
||||
<input name="Symmetric" type="checkbox" value="TRUE" checked="checked"/> symmetric
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Symmetric" type="checkbox" value="TRUE"/> symmetric
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${functional}">
|
||||
<input name="Functional" type="checkbox" value="TRUE" checked="checked"/> functional
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Functional" type="checkbox" value="TRUE"/> functional
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${inverseFunctional}">
|
||||
<input name="InverseFunctional" type="checkbox" value="TRUE" checked="checked"/> inverse functional
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="InverseFunctional" type="checkbox" value="TRUE"/> inverse functional
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>Optional: display tier for this property<br />
|
||||
|
|
@ -174,7 +132,7 @@
|
|||
<span class="notice"><c:out value="${DomainDisplayTierError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<td valign="bottom" colspan="2">
|
||||
<em>Optional: display tier for this property's inverse<br />
|
||||
(<strong>lower</strong> numbers display first)</em><br/>
|
||||
<input name="RangeDisplayTier" value="<form:value name="RangeDisplayTier"/>" style="width:15%;" />
|
||||
|
|
@ -183,7 +141,7 @@
|
|||
<span class="notice"><c:out value="${RangeDisplayTierError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<td valign="bottom" colspan="2">
|
||||
<em>Related <strong>object individuals</strong> to display without collapsing<br />
|
||||
(<strong>lower</strong> numbers display first)</em><br/>
|
||||
<input name="DomainDisplayLimit" value="<form:value name="DomainDisplayLimit"/>" style="width:15%;" />
|
||||
|
|
@ -192,89 +150,137 @@
|
|||
<span class="notice"><c:out value="${DomainDisplayLimitError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>Related <strong>object individuals of inverse property</strong> to display without collapsing</em><br />
|
||||
(<strong>lower</strong> numbers display first)<br/>
|
||||
<input name="RangeDisplayLimit" value="<form:value name="RangeDisplayLimit"/>" style="width:15%;" />
|
||||
<c:set var="RangeDisplayLimitError"><form:error name="RangeDisplayLimit"/></c:set>
|
||||
<c:if test="${!empty RangeDisplayLimitError}">
|
||||
<span class="notice"><c:out value="${RangeDisplayLimitError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="1">
|
||||
<td valign="bottom" colspan="2">
|
||||
<em>Optional: <strong>sort direction</strong><br />
|
||||
(blank for ascending, "desc" for descending)</em><br/>
|
||||
<input name="DomainEntitySortDirection" value="<form:value name="DomainEntitySortDirection"/>" />
|
||||
<c:set var="DomainEntitySortDirectionError"><form:error name="DomainEntitySortDirection"/></c:set>
|
||||
<c:if test="${!empty DomainEntitySortDirectionError}">
|
||||
<span class="notice"><c:out value="${DomainEntitySortDirectionError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="5">
|
||||
<c:choose>
|
||||
<c:when test="${collateBySubclass}">
|
||||
<input name="CollateBySubclass" type="checkbox" value="TRUE" checked="checked"/>collate by subclass
|
||||
<input name="CollateBySubclass" type="checkbox" value="TRUE" checked="checked"/>collate by subclass
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="CollateBySubclass" type="checkbox" value="TRUE"/>collate by subclass
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em><strong>Caution:</strong>delete object when statement deleted?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${stubObjectRelation}">
|
||||
<input name="StubObjectRelation" type="checkbox" value="TRUE" checked="checked"/>stub object relation with force delete
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="StubObjectRelation" type="checkbox" value="TRUE"/>stub object relation with force delete
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>select from existing choices when adding statements?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${selectFromExisting}">
|
||||
<input name="SelectFromExisting" type="checkbox" value="TRUE" checked="checked"/>provide selection
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="SelectFromExisting" type="checkbox" value="TRUE"/>provide selection
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>when adding a new statement, also offer option to create new individual?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${offerCreateNewOption}">
|
||||
<input name="OfferCreateNewOption" type="checkbox" value="TRUE" checked="checked"/>offer create option
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="OfferCreateNewOption" type="checkbox" value="TRUE"/>offer create option
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="4">
|
||||
<em>custom entry form</em><br />
|
||||
<input name="CustomEntryForm" size="30" value="<form:value name="CustomEntryForm"/>" />
|
||||
<c:set var="CustomEntryFormError"><form:error name="CustomEntryForm"/></c:set>
|
||||
<c:if test="${!empty CustomEntryFormError}">
|
||||
<span class="notice"><c:out value="${CustomEntryFormError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="4">
|
||||
<b>Example</b><br />
|
||||
<input name="Example" style="width:90%;" value="<form:value name="Example"/>" />
|
||||
<c:set var="ExampleError"><form:error name="Example"/></c:set>
|
||||
<c:if test="${!empty ExampleError}">
|
||||
<span class="notice"><c:out value="${ExampleError}"/></span>
|
||||
</c:if>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${transitive}">
|
||||
<input name="Transitive" type="checkbox" value="TRUE" checked="checked"/>transitive
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Transitive" type="checkbox" value="TRUE"/>transitive
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="2">
|
||||
<c:choose>
|
||||
<c:when test="${symmetric}">
|
||||
<input name="Symmetric" type="checkbox" value="TRUE" checked="checked"/> symmetric
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Symmetric" type="checkbox" value="TRUE"/> symmetric
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${functional}">
|
||||
<input name="Functional" type="checkbox" value="TRUE" checked="checked"/> functional
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="Functional" type="checkbox" value="TRUE"/> functional
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<c:choose>
|
||||
<c:when test="${inverseFunctional}">
|
||||
<input name="InverseFunctional" type="checkbox" value="TRUE" checked="checked"/> inverse functional
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="InverseFunctional" type="checkbox" value="TRUE"/> inverse functional
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="4">
|
||||
<b>Description</b> for ontology editors<br />
|
||||
<textarea name="Description" style="width:90%;"><form:value name="Description"/></textarea>
|
||||
<c:set var="DescriptionError"><form:error name="Description"/></c:set>
|
||||
<c:if test="${!empty DescriptionError}">
|
||||
<span class="notice"><c:out value="${DescriptionError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<td valign="bottom" colspan="2">
|
||||
<em>custom entry form</em><br />
|
||||
<input name="CustomEntryForm" size="30" value="<form:value name="CustomEntryForm"/>" />
|
||||
<c:set var="CustomEntryFormError"><form:error name="CustomEntryForm"/></c:set>
|
||||
<c:if test="${!empty CustomEntryFormError}">
|
||||
<span class="notice"><c:out value="${CustomEntryFormError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em><strong>Caution:</strong>delete object when statement deleted?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${stubObjectRelation}">
|
||||
<input name="StubObjectRelation" type="checkbox" value="TRUE" checked="checked"/>stub object relation with force delete
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="StubObjectRelation" type="checkbox" value="TRUE"/>stub object relation with force delete
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>select from existing choices when adding statements?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${selectFromExisting}">
|
||||
<input name="SelectFromExisting" type="checkbox" value="TRUE" checked="checked"/>provide selection
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="SelectFromExisting" type="checkbox" value="TRUE"/>provide selection
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td valign="bottom" colspan="1">
|
||||
<em>when adding a new statement, also offer option to create new individual?</em><br />
|
||||
<c:choose>
|
||||
<c:when test="${offerCreateNewOption}">
|
||||
<input name="OfferCreateNewOption" type="checkbox" value="TRUE" checked="checked"/>offer create option
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<input name="OfferCreateNewOption" type="checkbox" value="TRUE"/>offer create option
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="5">
|
||||
<b>Example</b><br />
|
||||
<input name="Example" style="width:90%;" value="<form:value name="Example"/>" />
|
||||
<c:set var="ExampleError"><form:error name="Example"/></c:set>
|
||||
<c:if test="${!empty ExampleError}">
|
||||
<span class="notice"><c:out value="${ExampleError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="editformcell">
|
||||
<td valign="bottom" colspan="5">
|
||||
<b>Description</b> for ontology editors<br />
|
||||
<textarea name="Description" style="width:90%;"><form:value name="Description"/></textarea>
|
||||
<c:set var="DescriptionError"><form:error name="Description"/></c:set>
|
||||
<c:if test="${!empty DescriptionError}">
|
||||
<span class="notice"><c:out value="${DescriptionError}"/></span>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue