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

Merging r5332 r5336:5338 r5341 r5349 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-20 23:24:01 +00:00
parent ea03604dc5
commit 4bfeadf3ad
8 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,8 @@ public class UrlBuilder {
public String getHomeUrl() {
String rootBreadCrumbUrl = portal.getRootBreadCrumbURL();
return StringUtils.isEmpty(rootBreadCrumbUrl) ? contextPath : rootBreadCrumbUrl;
String path = StringUtils.isEmpty(rootBreadCrumbUrl) ? "" : rootBreadCrumbUrl;
return getUrl(path);
}
public String getLogoutUrl() {
@ -155,10 +156,12 @@ public class UrlBuilder {
/********** Static utility methods **********/
public static String getUrl(String path) {
if ( ! path.startsWith("/") ) {
if ( !path.isEmpty() && !path.startsWith("/") ) {
path = "/" + path;
}
return contextPath + path;
path = contextPath + path;
return path.isEmpty() ? "/" : path;
}
public static String getUrl(String path, Params params) {