From b931f50cef88190ccfdbf2acd36786f32843fb77 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 4 Feb 2011 22:33:45 +0000
Subject: [PATCH] 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).

---
 .../ListedIndividualTemplateModel.java         | 18 ++++++++++++------
 .../freemarker/body/individualList.ftl         | 11 +++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

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 f65cdaedf..54a73868d 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
@@ -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() {           
diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl
index 1603c7656..ad8fe3f1d 100644
--- a/webapp/web/templates/freemarker/body/individualList.ftl
+++ b/webapp/web/templates/freemarker/body/individualList.ftl
@@ -35,15 +35,14 @@ ${stylesheets.add("/css/browseIndex.css")}
         <ul>
             <#list individuals as individual>
                 <li>
-                    <#assign moniker = individual.moniker!"">
+                    <#assign moniker = individual.moniker!>
                     <a href="${individual.profileUrl}">${individual.name}</a><#if moniker?has_content> <span class="moniker">${moniker}</span></#if>
-                    <#if individual.links?has_content>
+                    <#assign links = individual.links>
+                    <#if links?has_content>
                         <ul class="individualData">
                             <@l.firstLastList>
-                                <#list individual.links as link>
-                                    <#if link?? && link.url?? && link.anchor?? >
-                                        <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
-                                    </#if>
+                                <#list links as link>
+                                    <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
                                 </#list>
                             </@l.firstLastList>
                         </ul>