Several bugfixes for the Freemarker function library for PublicPersonalProfile
git-svn-id: https://svn.libreccm.org/ccm/trunk@6263 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
bc236ed798
commit
2128b250c4
|
|
@ -163,7 +163,8 @@
|
||||||
</#function>
|
</#function>
|
||||||
|
|
||||||
<#function getProjectGroupLink group>
|
<#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"]>
|
<#return "#" + group["./@name"]>
|
||||||
<#else>
|
<#else>
|
||||||
<#return "?group=" + group["./@name"]>
|
<#return "?group=" + group["./@name"]>
|
||||||
|
|
@ -175,16 +176,16 @@
|
||||||
</#function>
|
</#function>
|
||||||
|
|
||||||
<#function getProjectsOfGroup data>
|
<#function getProjectsOfGroup data>
|
||||||
<#return data["./ppp:profile/personalProjects/projects/projectGroup/project"]>
|
<#return data["./project"]>
|
||||||
</#function>
|
</#function>
|
||||||
|
|
||||||
<#function hasProjectsPaginator profile>
|
<#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>
|
||||||
|
|
||||||
<#function getProjectsPaginatorBaseUrl profile>
|
<#function getProjectsPaginatorBaseUrl profile>
|
||||||
<#if (model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"]?contains("?"))>
|
<#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>
|
<#else>
|
||||||
<#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "?">
|
<#return model["/bebop:page/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"] + "?">
|
||||||
</#if>
|
</#if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue