From e44bbf3929f8764e62ba5d40539f634954010707 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 5 Jul 2010 21:13:15 +0000
Subject: [PATCH] NIHVIVO-646 Handle authorships with no linked author in add
 authors to publication form.

---
 .../forms/addAuthorsToInformationResource.jsp | 33 ++++++++++---------
 .../css/addAuthorsToInformationResource.css   |  4 ---
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp
index 5a234aa4..f5585c3e 100644
--- a/productMods/edit/forms/addAuthorsToInformationResource.jsp
+++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp
@@ -330,11 +330,8 @@ SPARQL queries for existing values. --%>
             }                                                
         }
         request.setAttribute("rankValue", rankValue);
-
-        Individual author = authorship.getRelatedIndividual(vivoCore + "linkedAuthor");
-        if ( author != null ) {        
-            request.setAttribute("author", author);
-        } 
+       
+        request.setAttribute("author", authorship.getRelatedIndividual(vivoCore + "linkedAuthor"));
         
         // This value is used to replace a moved element after a failed reorder.
         // It's not the same as rank, because ranks may have gaps. 
@@ -347,18 +344,22 @@ SPARQL queries for existing values. --%>
             <%-- span.author will be used in the next phase, when we display a message that the author has been
             removed. That text will replace the a.authorLink, which will be removed. --%>    
             <span class="author">
+                <c:choose>
+                    <c:when test="${!empty author}">
+                        <c:url var="authorHref" value="/individual">
+                            <c:param name="uri" value="${author.URI}"/>
+                        </c:url> 
+                        <a href="${authorHref}" id="${author.URI}" class="authorLink">${author.name}</a>                   
+                    </c:when>
 
-<%          if (author != null) { // c:choose not working here, don't know why %>
-	            <c:url var="authorHref" value="/individual">
-	                <c:param name="uri" value="${author.URI}"/>
-	            </c:url> 
-	            <a href="${authorHref}" id="${author.URI}" class="authorLink">${author.name}</a>
-<%          } else { %>
-	            <c:url var="authorshipHref" value="/individual">
-	                <c:param name="uri" value="${authorshipUri}"/>
-	            </c:url>                
-	            <a href="${authorshipHref}" id="${authorshipUri}" class="authorLink noAuthor">${authorshipName}</a> <em>(no linked author)</em>
-<%          } %>
+                    <c:otherwise>
+	                   <c:url var="authorshipHref" value="/individual">
+	                       <c:param name="uri" value="${authorshipUri}"/>
+	                   </c:url>                
+	                   <a href="${authorshipHref}" id="${authorshipUri}" class="authorLink">${authorshipName}<em> (no linked author)</em></a>
+                    </c:otherwise>
+                </c:choose>
+                
                 <c:url var="deleteAuthorshipHref" value="/edit/primitiveDelete" />
                 <a href="${deleteAuthorshipHref}" class="remove">Remove</a>
                 <%-- <a href="${undoHref}" class="undo">Undo</a>  --%>
diff --git a/productMods/edit/forms/css/addAuthorsToInformationResource.css b/productMods/edit/forms/css/addAuthorsToInformationResource.css
index 067230cf..8e4326c8 100644
--- a/productMods/edit/forms/css/addAuthorsToInformationResource.css
+++ b/productMods/edit/forms/css/addAuthorsToInformationResource.css
@@ -20,10 +20,6 @@
     width: 15em;
 }
 
-#authorships a.authorLink.noAuthor {
-    width: auto;
-}
-
 #showAddForm span.or {
     display: none;
 }