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

resolves NIHVIVO-287 cardinality form

Browse source
This commit is contained in:
bjl23 2010-04-05 13:04:27 +00:00
parent 93c25072f9
commit 16f3dd4324
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
View file

@ -60,9 +60,8 @@ public class RestrictionRetryController extends BaseEditController {
String restrictionTypeStr = request.getParameter("restrictionType"); String restrictionTypeStr = request.getParameter("restrictionType");
epo.setAttribute("restrictionType",restrictionTypeStr); epo.setAttribute("restrictionType",restrictionTypeStr);
request.setAttribute("restrictionType",restrictionTypeStr);
// default to object property restriction // default to object property restriction
boolean propertyType = ("data".equals(request.getParameter("propertyType"))) ? DATA : OBJECT ; boolean propertyType = ("data".equals(request.getParameter("propertyType"))) ? DATA : OBJECT ;

26
webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp
View file

@ -1,33 +1,37 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
wtffff
${restrictionType}
${requestScope.restrictionType}
<tr class="editformcell"> <tr class="editformcell">
<td> <td>
<c:choose> <c:choose>
<c:when test="${restrictionType eq 'minCardinality'}"> <c:when test="${restrictionType eq 'minCardinality'}">
minimum cardinality <strong>minimum cardinality</strong>
<input type="hidden" name="cardinalityType" value="minCardinality"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${restrictionType eq 'maxCardinality'}"> <c:when test="${restrictionType eq 'maxCardinality'}">
maximum cardinality <strong>maximum cardinality</strong>
<input type="hidden" name="cardinalityType" value="maxCardinality"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:if test="${restrictionType eq 'cardinality' }"> <c:if test="${restrictionType eq 'cardinality' }">
exact cardinality <strong>exact cardinality</strong>
<input type="hidden" name="cardinalityType" value="cardinality"/>
</c:if> </c:if>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:otherwise>
</c:choose> </c:choose>
<select name="cardinalityType">
<option value="minCardinality">minimum cardinality</option>
<option value="maxCardinaltiy">maximum cardinatlity</option>
<option value="cardinality">cardinality (exact)</option>
</select>
</td>
<td>
<input name="cardinality"/> <input name="cardinality"/>
</td> </td>
</tr> </tr>