From a8816fd285b64763ed5dc613a98f0f03858997f9 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 30 Mar 2010 20:59:48 +0000
Subject: [PATCH] Fixed object property deletion screen to find custom short
 view of an inferred class.

---
 webapp/web/edit/forms/propDelete.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp
index 089efa7a6..71f54ad9c 100644
--- a/webapp/web/edit/forms/propDelete.jsp
+++ b/webapp/web/edit/forms/propDelete.jsp
@@ -110,10 +110,11 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
           request.setAttribute("objectName", FrontEndEditingUtils.getVitroNsObjDisplayName(predicateUri, object, model));
           log.debug("setting object name " + (String)request.getAttribute("objectName") + " for vitro namespace object property " + predicateUri);
     } else {
-        for (VClass clas : object.getVClasses(true)) { // direct VClasses, not inferred, and not including Vitro namespace
+        for (VClass clas : object.getVClasses()) { 
             request.setAttribute("rangeClassName", clas.getName());
             foundClass = true;
             customShortView = clas.getCustomShortView();
+            
     	    if (customShortView != null && customShortView.trim().length()>0) {
     	        log.debug("setting object name from VClass custom short view");
     	        request.setAttribute("customShortView",shortViewPrefix + customShortView.trim());
@@ -142,7 +143,7 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
 <jsp:include page="${preForm}"/>
 
 <form action="editRequestDispatch.jsp" method="get">
-    <label for="submit"><h2>Are you sure you want to delete the following entry for <em>${propertyName}</em>?</h2></label>
+    <label for="submit"><h2>Are you sure you want to delete the following entry from <em>${propertyName}</em>?</h2></label>
     <div class="toBeDeleted objProp">
     	<c:choose>
     		<c:when test="${!empty customShortView}">