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

Several bugfixes for Freemarker function/macro libraries 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6251 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-10-04 17:08:22 +00:00
parent e183cc9ef2
commit 234259f4a5
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-cms-assets-imagestep/web/themes/freemarker/ccm-cms-assets-imagestep.ftl
View File

@ -12,14 +12,12 @@
"imageId": image["./image/id"].@@text, "imageId": image["./image/id"].@@text,
"name": image["./image/name"].@@text, "name": image["./image/name"].@@text,
"caption": image["./caption"].@@text, "caption": image["./caption"].@@text,
"sortKey": image["./sortKey"]@number, "sortKey": image["./sortKey"].@@text?number,
"width": image["./width"]@number, "width": image["./image/width"].@@text,
"height": image["./width"]@number, "height": image["./image/height"].@@text,
"imageUrl: dispatcherPrefix + "/cms-service/stream/image/?image_id=" + image["./image/id"].@@text "imageUrl": dispatcherPrefix + "/cms-service/stream/image/?image_id=" + image["./image/id"].@@text
} }
)?sort_by("sortKey")> )?sort_by("sortKey")>
<#-- <#return item["./imageAttachments"]> -->
</#function> </#function>
<#-- <#function getImageId image> <#-- <#function getImageId image>

2
ccm-cms-assets-relatedlink/web/themes/freemarker/ccm-cms-assets-relatedlink.ftl
View File

@ -60,7 +60,7 @@
<#if (_getLinkType(link) == "caption")> <#if (_getLinkType(link) == "caption")>
<#return ""> <#return "">
<#elseif (_getLinkType(link) == "internalLink")> <#elseif (_getLinkType(link) == "internalLink")>
<#return "${contextPrefix}/redirect/?oid=${link['./targetItem/@oid']}${getInternalLinkParameters(link)}"> <#return "${contextPrefix}/redirect/?oid=${link['./targetItem/@oid']}${_getInternalLinkParameters(link)}">
<#else> <#else>
<#return link["./targetURI"].@@text> <#return link["./targetURI"].@@text>
</#if> </#if>

14
ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl
View File

@ -91,7 +91,7 @@
<#else> <#else>
<#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"].@@text + "?"> <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@baseURL"].@@text + "?">
</#if> </#if>
<#function> </#function>
<#function getPublicationsPaginatorPageCount profile> <#function getPublicationsPaginatorPageCount profile>
<#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageCount"].@@text> <#return model["/ppp:profile/personalPublications/publications/publicationGroup/nav:paginator/@pageCount"].@@text>
@ -126,7 +126,7 @@
</#function> </#function>
<#function getPublicationsPaginatonFirstPageLink profile> <#function getPublicationsPaginatonFirstPageLink profile>
<#return getPublicationsPaginatorBaseUrl(profile) + getPublicationsPaginatorPageParam(profile) + "=1)> <#return getPublicationsPaginatorBaseUrl(profile) + getPublicationsPaginatorPageParam(profile) + "=1">
</#function> </#function>
<#function getPublicationsPaginatorNextPageLink profile> <#function getPublicationsPaginatorNextPageLink profile>
@ -134,7 +134,7 @@
</#function> </#function>
<#function getPublicationsPaginatorLastPageLink profile> <#function getPublicationsPaginatorLastPageLink profile>
<#return getPublicationsPaginatorBaseUrl(profile) + getPublicationsPaginatorPageParam(profile) + "=" + getPublicationsPaginatorPageCount(profile))> <#return getPublicationsPaginatorBaseUrl(profile) + getPublicationsPaginatorPageParam(profile) + "=" + getPublicationsPaginatorPageCount(profile)>
</#function> </#function>
<#function getAvailableProjectGroups data> <#function getAvailableProjectGroups data>
@ -143,7 +143,7 @@
<#function getProjectGroupId group> <#function getProjectGroupId group>
<#return group["./@name"]> <#return group["./@name"]>
<#function> </#function>
<#function getProjectGroupLink group> <#function getProjectGroupLink group>
<#if (data["ppp:profile/personalPublications/publications/@all"] == "all")> <#if (data["ppp:profile/personalPublications/publications/@all"] == "all")>
@ -171,7 +171,7 @@
<#else> <#else>
<#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"].@@text + "?"> <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@baseURL"].@@text + "?">
</#if> </#if>
<#function> </#function>
<#function getProjectsPaginatorPageCount profile> <#function getProjectsPaginatorPageCount profile>
<#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageCount"].@@text> <#return model["/ppp:profile/personalProjects/projects/projectGroup/nav:paginator/@pageCount"].@@text>
@ -206,7 +206,7 @@
</#function> </#function>
<#function getProjectsPaginatonFirstPageLink profile> <#function getProjectsPaginatonFirstPageLink profile>
<#return getProjectsPaginatorBaseUrl(profile) + getProjectsPaginatorPageParam(profile) + "=1)> <#return getProjectsPaginatorBaseUrl(profile) + getProjectsPaginatorPageParam(profile) + "=1">
</#function> </#function>
<#function getProjectsPaginatorNextPageLink profile> <#function getProjectsPaginatorNextPageLink profile>
@ -214,7 +214,7 @@
</#function> </#function>
<#function getProjectsPaginatorLastPageLink profile> <#function getProjectsPaginatorLastPageLink profile>
<#return getProjectsPaginatorBaseUrl(profile) + getProjectsPaginatorPageParam(profile) + "=" + getProjectsPaginatorPageCount(profile))> <#return getProjectsPaginatorBaseUrl(profile) + getProjectsPaginatorPageParam(profile) + "=" + getProjectsPaginatorPageCount(profile)>
</#function> </#function>