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@6076 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-05-21 18:47:42 +00:00
parent 41da8d03bf
commit 41699a4488
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
View File

@ -18,7 +18,7 @@
</#function> </#function>
<#function isTabSelected tab> <#function isTabSelected tab>
<#return tab["./@selected]> <#return tab["./@selected"]>
</#function> </#function>
<#function getTabLink tab> <#function getTabLink tab>
@ -31,7 +31,7 @@
<#return item["./tab[@name='${selectedTab}']"]> --> <#return item["./tab[@name='${selectedTab}']"]> -->
<#return item["./orgaUnitTabs/selectedTab/*"] <#return item["./orgaUnitTabs/selectedTab/*"]>
</#function> </#function>
<#function getTypeOfSelectedTab item> <#function getTypeOfSelectedTab item>
@ -45,7 +45,7 @@
</#function> </#function>
<#function getPropertyFromTab tab name> <#function getPropertyFromTab tab name>
<#return tab["./*[name()='${name}']"> <#return tab["./*[name()='${name}']"]>
</#function> </#function>
<#function getTabContent tab> <#function getTabContent tab>
@ -54,7 +54,7 @@
<#function getAddendum data> <#function getAddendum data>
<#return data["./addendum"]> <#return data["./addendum"]>
<#function> </#function>
<#function getMembers data> <#function getMembers data>
<#return data["./members"]> <#return data["./members"]>
@ -65,11 +65,11 @@
</#function> </#function>
<#function getMemberStatus member> <#function getMemberStatus member>
<#return member["./@status]> <#return member["./@status"]>
</#function> </#function>
<#function getContactEntries member> <#function getContactEntries member>
<#return member["contacts/contact[@contactType = $contact-type]/contactentries]"> <#return member["contacts/contact[@contactType = $contact-type]/contactentries"]>
</#function> </#function>
<#function getOrgaUnitContact data> <#function getOrgaUnitContact data>

23
ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl
View File

@ -15,7 +15,7 @@
<#-- <pre>Found complex object list ${listId}</pre> --> <#-- <pre>Found complex object list ${listId}</pre> -->
<#return model["/bebop:page/nav:complexObjectList[@id='${listId}']/nav:objectList/nav:item"]> <#return model["/bebop:page/nav:complexObjectList[@id='${listId}']/nav:objectList/nav:item"]>
<#-- <#assign items=model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]> --> <#-- <#assign items=model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]> -->
<#elseif (model["/bebo p:page/nav:customizableObjectList[@id='${listId}']/nav:objectList"]?size > 0)> <#elseif (model["/bebop:page/nav:customizableObjectList[@id='${listId}']/nav:objectList"]?size > 0)>
<#-- <pre>Found customizable object list ${listId}</pre> --> <#-- <pre>Found customizable object list ${listId}</pre> -->
<#return model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]> <#return model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]>
<#-- <#assign items=model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]> --> <#-- <#assign items=model["/bebop:page/nav:simpleObjectList[@id='${listId}']/nav:objectList/nav:item"]> -->
@ -26,11 +26,11 @@
</#function> </#function>
<#function getObjectCount listId> <#function getObjectCount listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectCount"].@@text> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@objectCount"].@@text?number>
</#function> </#function>
<#function getPaginatorBaseUrl listId> <#function getPaginatorBaseUrl listId>
<#assign baseUrl = model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@baseURL"]> <#assign baseUrl = model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@baseURL"]>
<#if (baseUrl?contains("?"))> <#if (baseUrl?contains("?"))>
<#return baseUrl + "&"> <#return baseUrl + "&">
<#else> <#else>
@ -39,27 +39,32 @@
</#function> </#function>
<#function getPaginatorBegin listId> <#function getPaginatorBegin listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectBegin"]> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@objectBegin"].@@text?number>
</#function> </#function>
<#function getPaginatorEnd listId> <#function getPaginatorEnd listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectEnd"]> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@objectEnd"].@@text?number>
</#function> </#function>
<#function getPageCount listId> <#function getPageCount listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageCount"]> <#if (model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@pageCount"]?size == 1)>
<#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@pageCount"]?number>
<#else>
<#return 0>
</#if>
</#function> </#function>
<#function getPageNumber listId> <#function getPageNumber listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageNumber"]> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@pageNumber"].@@text?number>
</#function> </#function>
<#function getPageParam listId> <#function getPageParam listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageParam"]> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@pageParam"]>
</#function> </#function>
<#function getPageSize listId> <#function getPageSize listId>
<#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageSize"]> <#return model["/bebop:page/*[@id='${listId}']/nav:objectList/nav:paginator/@pageSize"].@@text?number>
</#function> </#function>
<#function getPrevPageLink listId> <#function getPrevPageLink listId>