From 16f3dd432454813d52bdac694d0a86a072436415 Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 5 Apr 2010 13:04:27 +0000
Subject: [PATCH] resolves NIHVIVO-287 cardinality form

---
 .../edit/RestrictionRetryController.java      |  5 ++--
 .../specific/cardinalityRestriction_retry.jsp | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
index 2334d7773..888766d98 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
@@ -60,9 +60,8 @@ public class RestrictionRetryController extends BaseEditController {
 			
 			String restrictionTypeStr = request.getParameter("restrictionType");
 			epo.setAttribute("restrictionType",restrictionTypeStr);
-			
-			
-			
+			request.setAttribute("restrictionType",restrictionTypeStr);
+				
 			// default to object property restriction
 			boolean propertyType = ("data".equals(request.getParameter("propertyType"))) ? DATA : OBJECT ;
 			
diff --git a/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp b/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp
index 484913d84..a0438593a 100644
--- a/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp
+++ b/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp
@@ -1,33 +1,37 @@
 <%-- $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" %>
 
+wtffff
+${restrictionType}
+${requestScope.restrictionType}
+
 <tr class="editformcell">
     <td>
         <c:choose>
         	<c:when test="${restrictionType eq 'minCardinality'}">
-            	minimum cardinality
+            	<strong>minimum cardinality</strong>
+                <input type="hidden" name="cardinalityType" value="minCardinality"/>
         	</c:when>
         	<c:otherwise>
         	    <c:choose>
         	        <c:when test="${restrictionType eq 'maxCardinality'}">
-        	            maximum cardinality
+        	            <strong>maximum cardinality</strong>
+                        <input type="hidden" name="cardinalityType" value="maxCardinality"/>
         	        </c:when>
         	        <c:otherwise>
         	             <c:if test="${restrictionType eq 'cardinality' }">
-        	                 exact cardinality
+        	                 <strong>exact cardinality</strong>
+                             <input type="hidden" name="cardinalityType" value="cardinality"/>
         	             </c:if>
         	        </c:otherwise>
         	    </c:choose>
+            </c:otherwise>
         </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"/>
+
     </td>
+  
 </tr>