From 2128b250c4b0825fb383897e22d7e30e6c1b388f Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 11 Oct 2019 15:47:06 +0000 Subject: [PATCH] Several bugfixes for the Freemarker function library for PublicPersonalProfile git-svn-id: https://svn.libreccm.org/ccm/trunk@6263 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/freemarker/ccm-cms-publicpersonalprofile.ftl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl b/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl index 03aab8d99..7b4e16ecd 100644 --- a/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl +++ b/ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl @@ -163,7 +163,8 @@ <#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 getProjectsOfGroup data> - <#return data["./ppp:profile/personalProjects/projects/projectGroup/project"]> + <#return data["./project"]> <#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 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"] + "?">