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

Merging r5308, r5320, r5322 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-19 21:37:59 +00:00
parent ddae9bb311
commit a5f60a9f7f
5 changed files with 60 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils" %>
<%@ page import="com.hp.hpl.jena.rdf.model.Model" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%>
<%@ page import="java.util.List" %>
@ -104,25 +105,18 @@ public WebappDaoFactory getUnfilteredDaoFactory() {
if( object == null ) {
//log.warn("Could not find object individual "+objectUri+" via wdf.getIndividualDao().getIndividualByURI(objectUri)");
request.setAttribute("objectName","(name unspecified)");
} else if (FrontEndEditingUtils.isVitroNsObjProp(predicateUri)) {
} else if (FrontEndEditingUtils.isVitroNsObjProp(predicateUri)) {
Model model = (Model)application.getAttribute("jenaOntModel");
request.setAttribute("individual", object);
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()) {
request.setAttribute("rangeClassName", clas.getName());
customShortView = MiscWebUtils.getCustomShortView(object, request);
if (customShortView != null) {
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());
request.setAttribute("individual",object);
} else {
log.debug("No custom short view for class, so setting object name from object individual name");
request.setAttribute("objectName",object.getName());
}
log.debug("setting object name from VClass custom short view");
request.setAttribute("customShortView",shortViewPrefix + customShortView.trim());
request.setAttribute("individual",object);
}
if (!foundClass) {
VClass clas = prop.getRangeVClass();