From 721117a2cf4a506672d4b624854a55864a0a3a2b Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 30 May 2019 13:01:20 +0000
Subject: [PATCH] Bugfixes for Freemarker functions

git-svn-id: https://svn.libreccm.org/ccm/trunk@6094 8810af33-2d31-482b-a856-94f89814c4df
---
 .../freemarker/ccm-cms-assets-fileattachments.ftl    |  2 +-
 .../web/themes/freemarker/ccm-cms-assets-notes.ftl   |  2 +-
 ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl   |  2 +-
 .../web/themes/freemarker/ccm-sci-types-project.ftl  | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ccm-cms-assets-fileattachment/web/themes/freemarker/ccm-cms-assets-fileattachments.ftl b/ccm-cms-assets-fileattachment/web/themes/freemarker/ccm-cms-assets-fileattachments.ftl
index 8a60cd436..27a542815 100644
--- a/ccm-cms-assets-fileattachment/web/themes/freemarker/ccm-cms-assets-fileattachments.ftl
+++ b/ccm-cms-assets-fileattachment/web/themes/freemarker/ccm-cms-assets-fileattachments.ftl
@@ -52,7 +52,7 @@
 </#function>
 
 <#function getFileDescription file>
-    <#return file["./description"]>
+    <#return file["./description"].@@text>
 </#function>
 
 <#function getFileUrl file>
diff --git a/ccm-cms-assets-notes/web/themes/freemarker/ccm-cms-assets-notes.ftl b/ccm-cms-assets-notes/web/themes/freemarker/ccm-cms-assets-notes.ftl
index 68cca8513..a523a1595 100644
--- a/ccm-cms-assets-notes/web/themes/freemarker/ccm-cms-assets-notes.ftl
+++ b/ccm-cms-assets-notes/web/themes/freemarker/ccm-cms-assets-notes.ftl
@@ -6,7 +6,7 @@
 >
 
 <#function getNotes item>
-    <#return item["./cms:item/ca_notes"]>
+    <#return item["./ca_notes"]>
 </#function>
 
 <#function getContent note>
diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
index 070f33b1f..d6be930e6 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
@@ -18,7 +18,7 @@
 </#function>
 
 <#function isTabSelected tab>
-    <#return tab["./@selected"]>
+    <#return (tab["./@selected"] == "true")>
 </#function>
 
 <#function getTabLink tab>
diff --git a/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl b/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
index cb51835ff..26fbee832 100644
--- a/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
+++ b/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
@@ -44,7 +44,7 @@
 </#function>
 
 <#function getSponsors item>
-    <#return item["./sponsors"]>
+    <#return item[".//sponsors/sponsor"]>
 </#function>
 
 <#function getSponsorName sponsor>
@@ -68,19 +68,19 @@
 </#function>
 
 <#function getFunding item>
-    <#return item["./funding"]>
+    <#return item[".//funding"]>
 </#function>
 
 <#function hasFundingVolume item>
-    <#return (item["./fundingVolume"]?size > 0)>
+    <#return (item[".//fundingVolume"]?size > 0)>
 </#function>
 
 <#function getFundingVolume item>
-    <#return item["./fundingVolume"]>
+    <#return item[".//fundingVolume"][1].@@text>
 </#function>
 
 <#function getMembers item>
-    <#return item["./members"]>
+    <#return item[".//members/member"]>
 </#function>
 
 <#function getMemberRole member>
@@ -116,7 +116,7 @@
 </#function>
 
 <#function getInvolvedOrganizations item>
-    <#return item["./involvedOrganizations"]>
+    <#return item[".//involvedOrganizations/organization"]>
 </#function>
 
 <#function getInvolvedOrganizationName orga>