From 4e851d0c357a653b2eb17d4454e4da5cf2c17ebc Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Wed, 16 Oct 2013 15:53:44 -0400
Subject: [PATCH] VIVO-372: check the domainUri to correctly display the manage
 icon

---
 .../individual/PropertyTemplateModel.java             |  4 ++++
 .../partials/individual/individual-properties.ftl     |  2 +-
 .../web/templates/freemarker/lib/lib-properties.ftl   | 11 ++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index 43240e66f..f7d5c603b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -129,6 +129,10 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         return rangeUri;
     }
     
+    public String getDomainUri() {
+        return domainUri;
+    }
+    
     public String getAddUrl() {
         //log.info("addUrl=" + addUrl);
         return (addUrl != null) ? addUrl : "";
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 610d4b409..7d3dd7b6b 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -12,7 +12,7 @@
         
             <article class="property" role="article">
                 <#-- Property display name -->
-                <#if rangeClass == "Authorship" && editable  >
+                <#if rangeClass == "Authorship" && editable && property.domainUri?contains("Person")>
                     <h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
                         <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> >
                             ${i18n().manage_publications_link}
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index fb69a6a8a..d5b5ec9c2 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -128,16 +128,21 @@ name will be used as the label. -->
     <#else>
         <#local rangeUri = "" /> 
     </#if>
+    <#if property.domainUri?? >
+        <#local domainUri = property.domainUri /> 
+    <#else>
+        <#local domainUri = "" /> 
+    </#if>
     <#if editable>
         <#local url = property.addUrl>
         <#if url?has_content>
-            <@showAddLink property.localName label url rangeUri/>
+            <@showAddLink property.localName label url rangeUri domainUri/>
         </#if>
     </#if>
 </#macro>
 
-<#macro showAddLink propertyLocalName label url rangeUri>
-    <#if rangeUri?contains("Authorship") || rangeUri?contains("URL") || rangeUri?contains("Editorship") || label == "hasResearchArea">
+<#macro showAddLink propertyLocalName label url rangeUri domainUri="">
+    <#if (rangeUri?contains("Authorship") && domainUri?contains("IAO_0000030")) || (rangeUri?contains("Editorship") && domainUri?contains("IAO_0000030"))|| rangeUri?contains("URL") || label == "hasResearchArea">
         <a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
         <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
     <#else>