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

Correct error in previous commit causing context path to be prepended twice to the individual profile url

Browse source
This commit is contained in:
ryounes 2011-03-29 22:07:33 +00:00
parent 7ebf7fdf29
commit 09af317822
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -94,8 +94,7 @@ public class IndividualController extends FreemarkerHttpServlet {
// Check to see if the request is for a non-information resource, redirect if it is. // Check to see if the request is for a non-information resource, redirect if it is.
String redirectURL = checkForRedirect ( url, vreq ); String redirectURL = checkForRedirect ( url, vreq );
if( redirectURL != null ){ if( redirectURL != null ){
redirectURL = UrlBuilder.getUrl(redirectURL); return new RedirectResponseValues(UrlBuilder.getUrl(redirectURL));
return new RedirectResponseValues(redirectURL);
} }
Individual individual = null; Individual individual = null;
@ -117,7 +116,7 @@ public class IndividualController extends FreemarkerHttpServlet {
// If this is an uploaded file, redirect to its "alias URL". // If this is an uploaded file, redirect to its "alias URL".
String aliasUrl = getAliasUrlForBytestreamIndividual(vreq, individual); String aliasUrl = getAliasUrlForBytestreamIndividual(vreq, individual);
if (aliasUrl != null) { if (aliasUrl != null) {
return new RedirectResponseValues(UrlBuilder.getUrl(vreq.getContextPath() + aliasUrl)); return new RedirectResponseValues(UrlBuilder.getUrl(aliasUrl));
} }
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
@ -480,7 +479,7 @@ public class IndividualController extends FreemarkerHttpServlet {
}//else send them to html }//else send them to html
} }
//else redirect to HTML representation //else redirect to HTML representation
return UrlBuilder.getUrl("display/" + m.group(1)); return "display/" + m.group(1);
}else{ }else{
return null; return null;
} }