From 43ba41711bf5c3c9047298e8243808751b33fe34 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 8 Apr 2011 20:39:22 +0000
Subject: [PATCH] NIHVIVO-2472 Suppress classgroup search refinement link when
 classgroup has no public name

---
 .../vitro/webapp/search/controller/PagedSearchController.java | 4 +++-
 .../individual/ListedIndividualTemplateModel.java             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
index 27e2f8e54..f8a375676 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
@@ -334,7 +334,9 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
                     List<VClassGroup> classgroups = getClassGroups(grpDao, topDocs, searcherForRequest);
                     List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size());
                     for (VClassGroup vcg : classgroups) {
-                        classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg));
+                        if (vcg.getPublicName() != null) {
+                            classGroupLinks.add(new VClassGroupSearchLink(qtxt, vcg));
+                        }
                     }
                     body.put("classGroupLinks", classGroupLinks);                       
      
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ListedIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ListedIndividualTemplateModel.java
index 54a73868d..8ff867f4d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ListedIndividualTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ListedIndividualTemplateModel.java
@@ -69,7 +69,7 @@ public class ListedIndividualTemplateModel extends BaseTemplateModel {
         Link primaryLink = null;
         String anchor = individual.getAnchor();
         String url = individual.getUrl();
-        if (anchor != null && url != null) {
+        if ( !(StringUtils.isEmpty(anchor)) && !(StringUtils.isEmpty(url)) ) {
             primaryLink = new Link();
             primaryLink.setAnchor(anchor);
             primaryLink.setUrl(url);