From 8413938501b5bad56d13c6acea422ce61f371be3 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 22 Jul 2010 20:48:12 +0000
Subject: [PATCH] Merge to trunk. Adding cancel button to default object
 property form. NIHVIVO-951

---
 webapp/web/edit/forms/defaultObjPropForm.jsp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/web/edit/forms/defaultObjPropForm.jsp b/webapp/web/edit/forms/defaultObjPropForm.jsp
index ed6789361..14b8b5345 100644
--- a/webapp/web/edit/forms/defaultObjPropForm.jsp
+++ b/webapp/web/edit/forms/defaultObjPropForm.jsp
@@ -154,7 +154,9 @@
 	    </div>    
     </form>
   </c:if>
+  <c:set var="offerCancel" value="false"/>
   <c:if test="${requestScope.rangeOptionsExist == false }">
+  	<c:set var="offerCancel" value="true"/>
     <p>There are no entries in the system to select from.</p>
   </c:if>
 </c:if>
@@ -173,10 +175,13 @@
         <input type="hidden" value="${param.objectUri}" name="objectUri"/>        
 		<input type="hidden" value="create" name="cmd"/>        
 		<v:input type="typesForCreateNew" id="typeOfNew" />
-        <v:input type="submit" id="submit" value="add a new item to this list"/>
+        <v:input type="submit" id="submit" value="add a new item to this list" cancel="${offerCancel}"/>
 	</form>                            
 </c:if>
 
+
+  
+
 <c:if test="${(requestScope.predicate.offerCreateNewOption == false) && (requestScope.predicate.selectFromExisting == false)}">
  <p>This property is currently configured to prohibit editing. </p>
 </c:if>