Several bugfixes for the Freemarker function library for PublicPersonalProfile

git-svn-id: https://svn.libreccm.org/ccm/trunk@6263 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-10-11 15:47:06 +00:00
parent bc236ed798
commit 2128b250c4
1 changed files with 5 additions and 4 deletions

View File

@ -163,7 +163,8 @@
</#function>
<#function getProjectGroupLink group>
<#if (data["ppp:profile/personalPublications/publications/@all"] == "all")>
<#if (model["/bebop:page/ppp:profile/personalPublications/publications/@all"]?size > 0
&& model["/bebop:page/ppp:profile/personalPublications/publications/@all"] == "all")>
<#return "#" + group["./@name"]>
<#else>
<#return "?group=" + group["./@name"]>
@ -175,16 +176,16 @@
</#function>
<#function getProjectsOfGroup data>
<#return data["./ppp:profile/personalProjects/projects/projectGroup/project"]>
<#return data["./project"]>
</#function>
<#function hasProjectsPaginator profile>
<#return (model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator"]?size > 0)>
<#return (model["./bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator"]?size > 0)>
</#function>
<#function getProjectsPaginatorBaseUrl profile>
<#if (model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"]?contains("?"))>
<#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "&">
<#return model["/bebop:page/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "&">
<#else>
<#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "?">
</#if>