From d6bacf0c957d2567cdde25f15a09e04108e76446 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 26 May 2011 14:35:09 +0000
Subject: [PATCH] Revert changes in r8069 since it was messing up display of
 mainImage in edit mode for individuals with no image

---
 .../body/partials/individual/lib-properties.ftl    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 4f68fc934..5f84cdf4c 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -81,17 +81,15 @@ Assumes property is non-null. -->
 we need to also show the property label. If no label is specified, the property
 name will be used as the label. -->
 <#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams="">
-    <#if property?has_content>
-        <#local addLink><@addLink property editable label extraParams /></#local>
-        <#local verboseDisplay><@verboseDisplay property /></#local>
-        <#if addLink?has_content || verboseDisplay?has_content>
-            <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>         
-        </#if>
+    <#local addLink><@addLink property editable label extraParams /></#local>
+    <#local verboseDisplay><@verboseDisplay property /></#local>
+    <#if addLink?has_content || verboseDisplay?has_content>
+        <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>         
     </#if>
 </#macro>
 
 <#macro addLink property editable label="${property.name}" extraParams="">
-    <#if property?has_content && editable>
+    <#if editable>
         <#local url = property.addUrl>
         <#if url?has_content>
             <@showAddLink property.localName label addParamsToEditUrl(url, extraParams) />
@@ -210,7 +208,7 @@ name will be used as the label. -->
      Note that this macro has a side-effect in the call to propertyGroups.pullProperty().
 -->
 <#macro image individual propertyGroups namespaces editable showPlaceholder="never" placeholder="">
-    <#local mainImage = propertyGroups.pullProperty("${namespaces.vitroPublic}fake")!>
+    <#local mainImage = propertyGroups.pullProperty("${namespaces.vitroPublic}mainImage")!>
     <#local extraParams = "">
     <#if placeholder?has_content>
         <#local extraParams = { "placeholder" : placeholder } >