From 0d7179d6f0e847c305d5eb0f47dbee091315ba5a Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 31 Mar 2011 19:04:18 +0000
Subject: [PATCH] Rename getPropertyAndRemoveFromList() to pullProperty(). The
 original method remains in the code but marked deprecated.

---
 .../body/individual/individual--foaf-person.ftl           | 8 ++++----
 .../body/partials/individual/individual-overview.ftl      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index ac9c7754..e050de92 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -35,7 +35,7 @@
         </nav>
             
         <#-- Email -->    
-        <#assign email = propertyGroups.getPropertyAndRemoveFromList("${core}email")!>      
+        <#assign email = propertyGroups.pullProperty("${core}email")!>      
         <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <@p.addLinkWithLabel email editable />
             <#if email.statements?has_content> <#-- if there are any statements -->
@@ -51,7 +51,7 @@
         </#if>
           
         <#-- Phone --> 
-        <#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!>
+        <#assign phone = propertyGroups.pullProperty("${core}phoneNumber")!>
         <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <@p.addLinkWithLabel phone editable />
             <#if phone.statements?has_content> <#-- if there are any statements -->
@@ -112,7 +112,7 @@
             </#if>
                
             <#-- Positions -->
-            <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
+            <#assign positions = propertyGroups.pullProperty("${core}personInPosition")!>
             <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
                 <@p.objectPropertyListing positions editable />
             </#if> 
@@ -122,7 +122,7 @@
         <#include "individual-overview.ftl">
         
         <#-- Research Areas -->
-        <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> 
+        <#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!> 
         <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <@p.objectPropertyListing researchAreas editable />
         </#if>   
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
index 13c6b5c3..b67e17f7 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
@@ -2,7 +2,7 @@
 
 <#-- Overview on individual profile page -->
 
-<#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> 
+<#assign overview = propertyGroups.pullProperty("${core}overview")!> 
 <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <@p.addLinkWithLabel overview editable />
     <#list overview.statements as statement>