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

Fixed object property deletion screen to find custom short view of an inferred class.

Browse source
This commit is contained in:
rjy7 2010-03-30 20:59:48 +00:00
parent c7fdb7d9be
commit a8816fd285
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/web/edit/forms/propDelete.jsp
View file

@ -110,10 +110,11 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
request.setAttribute("objectName", FrontEndEditingUtils.getVitroNsObjDisplayName(predicateUri, object, model)); request.setAttribute("objectName", FrontEndEditingUtils.getVitroNsObjDisplayName(predicateUri, object, model));
log.debug("setting object name " + (String)request.getAttribute("objectName") + " for vitro namespace object property " + predicateUri); log.debug("setting object name " + (String)request.getAttribute("objectName") + " for vitro namespace object property " + predicateUri);
} else { } 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()); request.setAttribute("rangeClassName", clas.getName());
foundClass = true; foundClass = true;
customShortView = clas.getCustomShortView(); customShortView = clas.getCustomShortView();
if (customShortView != null && customShortView.trim().length()>0) { if (customShortView != null && customShortView.trim().length()>0) {
log.debug("setting object name from VClass custom short view"); log.debug("setting object name from VClass custom short view");
request.setAttribute("customShortView",shortViewPrefix + customShortView.trim()); request.setAttribute("customShortView",shortViewPrefix + customShortView.trim());
@ -142,7 +143,7 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
<jsp:include page="${preForm}"/> <jsp:include page="${preForm}"/>
<form action="editRequestDispatch.jsp" method="get"> <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"> <div class="toBeDeleted objProp">
<c:choose> <c:choose>
<c:when test="${!empty customShortView}"> <c:when test="${!empty customShortView}">