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

NIHVIVO-2472 Suppress classgroup search refinement link when classgroup has no public name

Browse source
This commit is contained in:
ryounes 2011-04-08 20:39:22 +00:00
parent 683234974e
commit 43ba41711b
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -334,8 +334,10 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
List<VClassGroup> classgroups = getClassGroups(grpDao, topDocs, searcherForRequest); List<VClassGroup> classgroups = getClassGroups(grpDao, topDocs, searcherForRequest);
List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size()); List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size());
for (VClassGroup vcg : classgroups) { for (VClassGroup vcg : classgroups) {
if (vcg.getPublicName() != null) {
classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg)); classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg));
} }
}
body.put("classGroupLinks", classGroupLinks); body.put("classGroupLinks", classGroupLinks);
// Search request is for a classgroup, so add rdf:type search refinement links // Search request is for a classgroup, so add rdf:type search refinement links

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

@ -69,7 +69,7 @@ public class ListedIndividualTemplateModel extends BaseTemplateModel {
Link primaryLink = null; Link primaryLink = null;
String anchor = individual.getAnchor(); String anchor = individual.getAnchor();
String url = individual.getUrl(); String url = individual.getUrl();
if (anchor != null && url != null) { if ( !(StringUtils.isEmpty(anchor)) && !(StringUtils.isEmpty(url)) ) {
primaryLink = new Link(); primaryLink = new Link();
primaryLink.setAnchor(anchor); primaryLink.setAnchor(anchor);
primaryLink.setUrl(url); primaryLink.setUrl(url);