From 011594c7fc7827b635ad6b7cd4051edd7635849d Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 16 Oct 2013 14:29:20 -0400 Subject: [PATCH] VIVO-371 RDF link should be based on /individual, not /display Removing Tim's "quick fix" in the template and fixing it in the TemplateModel. --- .../individual/BaseIndividualTemplateModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java index f35e0d17d..bed1d0daf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java @@ -95,9 +95,11 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel { String individualUri = getUri(); String profileUrl = getProfileUrl(); - boolean isUriInDefaultNamespace = UrlBuilder.isUriInDefaultNamespace(individualUri, vreq); - return isUriInDefaultNamespace ? profileUrl + "/" + getLocalName() + ".rdf" - : UrlBuilder.addParams(profileUrl, "format", "rdfxml"); + if (UrlBuilder.isUriInDefaultNamespace(individualUri, vreq)) { + return UrlBuilder.getUrl("/individual/" + getLocalName() + "/" + getLocalName() + ".rdf") ; + } else { + return UrlBuilder.addParams(profileUrl, "format", "rdfxml"); + } } public GroupedPropertyList getPropertyList() {