litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename getPropertyAndRemoveFromList() to pullProperty(). The original method remains in the code but marked deprecated.

Browse source
This commit is contained in:
ryounes 2011-03-31 19:04:18 +00:00
parent d1d03fa40f
commit 0d7179d6f0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -35,7 +35,7 @@
</nav> </nav>
<#-- Email --> <#-- 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) --> <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.addLinkWithLabel email editable /> <@p.addLinkWithLabel email editable />
<#if email.statements?has_content> <#-- if there are any statements --> <#if email.statements?has_content> <#-- if there are any statements -->
@ -51,7 +51,7 @@
</#if> </#if>
<#-- Phone --> <#-- 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) --> <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.addLinkWithLabel phone editable /> <@p.addLinkWithLabel phone editable />
<#if phone.statements?has_content> <#-- if there are any statements --> <#if phone.statements?has_content> <#-- if there are any statements -->
@ -112,7 +112,7 @@
</#if> </#if>
<#-- Positions --> <#-- 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) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.objectPropertyListing positions editable /> <@p.objectPropertyListing positions editable />
</#if> </#if>
@ -122,7 +122,7 @@
<#include "individual-overview.ftl"> <#include "individual-overview.ftl">
<#-- Research Areas --> <#-- 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) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.objectPropertyListing researchAreas editable /> <@p.objectPropertyListing researchAreas editable />
</#if> </#if>

2
productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
View file

@ -2,7 +2,7 @@
<#-- Overview on individual profile page --> <#-- 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) --> <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.addLinkWithLabel overview editable /> <@p.addLinkWithLabel overview editable />
<#list overview.statements as statement> <#list overview.statements as statement>