LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes for Freemarker functions 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6082 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-05-24 19:08:49 +00:00
parent bb12bfa682
commit ab8ed2e2e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl
View File

@ -19,7 +19,7 @@
<#function getContactEntry item keyId> <#function getContactEntry item keyId>
<#return item["./contactentries[keyId=${keyId}]"]> <#return item["./contactentries[keyId=${keyId}]"]>
<#/function> </#function>
<#function getContactEntryLabel entry> <#function getContactEntryLabel entry>
<#return item["./key"]> <#return item["./key"]>

4
ccm-cms/web/themes/freemarker/ccm-cms/person.ftl
View File

@ -22,7 +22,7 @@
</#function> </#function>
<#function getHomepageLink item contactType="commonContact" entry="homepage"> <#function getHomepageLink item contactType="commonContact" entry="homepage">
<#return item["./contacts/contact[./@contactType='${contactType}']/contactentries[./keyId='${entry}]/value'"]> <#return item["./contacts/contact[./@contactType='${contactType}']/contactentries[./keyId='${entry}']/value"]>
</#function> </#function>
<#function getContactEntries item contactType="commonContact"> <#function getContactEntries item contactType="commonContact">
@ -30,5 +30,5 @@
</#function> </#function>
<#function getAddress item contactType="commonContact"> <#function getAddress item contactType="commonContact">
<#return item["./contacts/contact[@contactType='${contactType}']/address] <#return item["./contacts/contact[@contactType='${contactType}']/address"]>
</#function> </#function>

6
ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl
View File

@ -26,7 +26,7 @@
</#function> </#function>
<#function getDepartmentHeads data> <#function getDepartmentHeads data>
<#return data["./heads"]> <#return data["./heads/head"]>
</#function> </#function>
<#function getDepartmentHeadId head> <#function getDepartmentHeadId head>
@ -38,7 +38,7 @@
</#function> </#function>
<#function getDepartmentViceHeads data> <#function getDepartmentViceHeads data>
<#return data["./heads"]> <#return data["./viceheads/vicehead"]>
</#function> </#function>
<#function getDepartmentViceHeadId head> <#function getDepartmentViceHeadId head>
@ -50,7 +50,7 @@
</#function> </#function>
<#function getSecretariats data> <#function getSecretariats data>
<#return data["./heads"]> <#return data["./secretariats/secretariat"]>
</#function> </#function>
<#function getSecretariatsId sec> <#function getSecretariatsId sec>