From 0a516b0a011f82c382aa60b7e71f058a2c371fad Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Mon, 16 Feb 2015 11:03:29 -0500
Subject: [PATCH] VIVO-970: added domain and range display limit fields to
 object property editing form. The display is now used with the 'more...' link
 on profile pages.

---
 .../vitro/webapp/beans/ObjectProperty.java    |  4 ++--
 .../ObjectPropertyTemplateModel.java          |  9 +++++++-
 .../individual/PropertyTemplateModel.java     |  4 ++--
 .../edit/specific/property_retry.jsp          | 23 +++++++++++++++++++
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
index d78d92057..37405653e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
@@ -55,13 +55,13 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
 
     private String domainEntitySortDirection = null;
     private Integer domainDisplayTier = null;
-    private Integer domainDisplayLimit = 5;
+    private Integer domainDisplayLimit = null;
 
     private String objectIndividualSortPropertyURI = null;
     
     private String rangeEntitySortDirection = null;
     private Integer rangeDisplayTier = null;
-    private Integer rangeDisplayLimit = 5;
+    private Integer rangeDisplayLimit = null;
     
     private boolean selectFromExisting = true;
     private boolean offerCreateNewOption = false;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index ceb2358f3..532ab080b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -81,6 +81,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     private PropertyListConfig config;
     private String objectKey;    
     private String sortDirection;
+	private int displayLimit;
     
     ObjectPropertyTemplateModel(ObjectProperty op, Individual subject, VitroRequest vreq, 
             boolean editing)
@@ -91,7 +92,8 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         sortDirection = op.getDomainEntitySortDirection();
         domainUri = op.getDomainVClassURI();
         rangeUri = op.getRangeVClassURI();
-        
+		displayLimit = op.getDomainDisplayLimit();
+
         // Get the config for this object property
         try {
         	config = new PropertyListConfig(this, getFreemarkerTemplateLoader(), vreq, op, editing);
@@ -175,6 +177,11 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         return Route.OBJECT_PROPERTY_EDIT;
     }
 
+	@Override
+	public int getDisplayLimit() {
+			return displayLimit;
+	}	
+
     public ConfigError checkQuery(String queryString) {
         if (StringUtils.isBlank(queryString)) {
             return ConfigError.NO_SELECT_QUERY;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index 4c1c7a99b..ca37cd96e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -14,6 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
@@ -57,8 +58,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         if (fauxProperty != null) {
         	this.name = fauxProperty.getDisplayName();
 			this.displayLimit = fauxProperty.getDisplayLimit();
-        } 
-
+        }
         setVerboseDisplayValues(property);
     }
     
diff --git a/webapp/web/templates/edit/specific/property_retry.jsp b/webapp/web/templates/edit/specific/property_retry.jsp
index b264bf52b..e83ae531e 100644
--- a/webapp/web/templates/edit/specific/property_retry.jsp
+++ b/webapp/web/templates/edit/specific/property_retry.jsp
@@ -240,6 +240,29 @@
         </c:choose>            
     </td>
 </tr>
+<tr class="editformcell" >
+	<td valign="top" colspan="2" style="padding-top:25px">
+		<b>Display limit</b> for this property<br/>
+		<input type="text" class="shortInput" name="DomainDisplayLimit" value="<form:value name="DomainDisplayLimit"/>"/>
+        <c:set var="DomainDisplayLimitError"><form:error name="DomainDisplayLimit"/></c:set>
+        <c:if test="${!empty DomainDisplayLimitError}">
+            <span class="notice"><c:out value="${DomainDisplayLimitError}"/></span>
+        </c:if>
+	</td>
+	<td valign="top" colspan="2">
+		<b>Display limit</b> for inverse property<br/>
+		<input type="text" class="shortInput" name="RangeDisplayLimit" value="<form:value name="RangeDisplayLimit"/>"/>
+        <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="top" colspan="6"  style="padding-top:-12px">
+		The limit before the &quot;more ...&quot; button is displayed.<br/>
+	</td>
+</tr>
 <tr><td colspan="5"><hr class="formDivider"/></td></tr>
 <tr class="editformcell">
     <td valign="top" colspan="2">