From 7a09152f53cef1534c03073a1ed4beaf221133a4 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 25 Mar 2010 19:10:58 +0000
Subject: [PATCH] NIHVIVO-144 Corrected query parameters on primary and
 additional link edit/delete links. (These links still generate errors when
 clicked, though.)

---
 .../cornell/mannlib/vitro/webapp/beans/IndividualImpl.java  | 1 -
 webapp/web/templates/entity/entityBasic.jsp                 | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
index 73943ad53..158cd310e 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.beans;
 
-import edu.cornell.mannlib.vitro.webapp.beans.*;
 import org.json.JSONException;
 import org.json.JSONObject;
 
diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index 0eff3c00c..5b93b9b6e 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -8,6 +8,7 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Link" %>
 
 <%@ page import="org.apache.commons.logging.Log" %>
 <%@ page import="org.apache.commons.logging.LogFactory" %>
@@ -142,6 +143,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
             </div> <!-- end labelAndMoniker -->
             
             <%-- Links --%>
+
             <c:if test="${ showEdits || !empty entity.url || !empty entity.linksList }"> 
                 <div id="dprop-vitro-links" class="propsItem ${editingClass}">
                     <c:if test="${showEdits}">
@@ -166,7 +168,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                                         <span class="statementWrap">
                                             <a class="externalLink" href="<c:out value="${entityUrl}"/>"><p:process>${entity.anchor}</p:process></a>
                                             <c:if test="${showEdits}">
-                                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.PRIMARY_LINK %>" data="${entity.url}" icons="false"/></c:set>
+                                                <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.PRIMARY_LINK %>" data="${entity.primaryLink.URI}" icons="false"/></c:set>
                                                 <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                           
                                             </c:if>
                                         </span>
@@ -190,7 +192,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                                 <span class="statementWrap">
                                     <a class="externalLink" href="<c:out value="${linkUrl}"/>"><p:process>${link.anchor}</p:process></a>
                                     <c:if test="${showEdits}">
-                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.ADDITIONAL_LINK %>" data="${linkUrl}" icons="false"/></c:set>
+                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.ADDITIONAL_LINK %>" data="${link.URI}" icons="false"/></c:set>
                                         <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                           
                                     </c:if>  
                                 </span>