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

Merge r7914, r7921 from nihvivo-rel-1.2-maint

Browse source
This commit is contained in:
ryounes 2011-04-29 18:49:50 +00:00
parent 57d9d061b5
commit f1ae5c6f01
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -306,7 +306,7 @@ public class UrlBuilder {
} else { } else {
if (wadf.getApplicationDao().isExternallyLinkedNamespace(namespace)) { if (wadf.getApplicationDao().isExternallyLinkedNamespace(namespace)) {
log.debug("Found externally linked namespace " + namespace); log.debug("Found externally linked namespace " + namespace);
profileUrl = namespace + "/" + localName; profileUrl = namespace + localName;
} else { } else {
ParamMap params = new ParamMap("uri", individualUri); ParamMap params = new ParamMap("uri", individualUri);
profileUrl = getUrl("/individual", params); profileUrl = getUrl("/individual", params);

11
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
View file

@ -228,15 +228,12 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
} }
private String getSubclassName(String subclassUri, VitroRequest vreq) { private String getSubclassName(String subclassUri, VitroRequest vreq) {
String subclassName = null;
if (subclassUri.isEmpty()) { if (subclassUri.isEmpty()) {
subclassName = ""; return "";
} else {
VClassDao vclassDao = vreq.getWebappDaoFactory().getVClassDao();
VClass vclass = vclassDao.getVClassByURI(subclassUri);
subclassName = vclass.getName();
} }
return subclassName; VClassDao vclassDao = vreq.getWebappDaoFactory().getVClassDao();
VClass vclass = vclassDao.getVClassByURI(subclassUri);
return vclass != null ? vclass.getName() : "";
} }
/* Access methods for templates */ /* Access methods for templates */