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

NIHVIVO-2045 Hide incomplete/malformed links from individualList template, to make things easier (it doesn't have to check the wellformedness of each link before knowing whether to print the ul around the links).

Browse source
This commit is contained in:
rjy7 2011-02-04 22:33:45 +00:00
parent f3e76bfb1a
commit b931f50cef
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ListedIndividualTemplateModel.java
View file

@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -70,25 +71,30 @@ public class ListedIndividualTemplateModel extends BaseTemplateModel {
String url = individual.getUrl();
if (anchor != null && url != null) {
primaryLink = new Link();
primaryLink.setAnchor(individual.getAnchor());
primaryLink.setUrl(individual.getUrl());
primaryLink.setAnchor(anchor);
primaryLink.setUrl(url);
}
return primaryLink;
}
public List<Link> getAdditionalLinks() {
return individual.getLinksList();
return individual.getLinksList(); // returns an empty list, but not null
}
public List<Link> getLinks() {
List<Link> additionalLinks = getAdditionalLinks();
List<Link> additionalLinks = getAdditionalLinks(); // returns an empty list, but not null
List<Link> links = new ArrayList<Link>(additionalLinks.size()+1);
Link primaryLink = getPrimaryLink();
if (primaryLink != null) {
links.add(primaryLink);
}
links.addAll(additionalLinks);
return links;
for (Link link : additionalLinks) {
// Hide malformed links from the template to make things easier
if ( !(StringUtils.isEmpty(link.getAnchor())) && !(StringUtils.isEmpty(link.getUrl())) ) {
links.add(link);
}
}
return links; // returns an empty list, but not null
}
public String getName() {