From 550f35eb3e728a99105a6bf763e484cd7afe6666 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 26 May 2019 11:02:51 +0000
Subject: [PATCH] Bugfixes for Freemarker functions

git-svn-id: https://svn.libreccm.org/ccm/trunk@6088 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms-types-decisiontree/application.xml    |  1 +
 ccm-cms-types-externallink/application.xml    |  1 +
 ccm-cms-types-image/application.xml           |  1 +
 .../themes/freemarker/ccm-cms/orgaunit.ftl    |  4 ++++
 ccm-sci-types-project/application.xml         |  7 +++---
 .../freemarker/ccm-sci-types-project.ftl      | 24 ++++++++++++++-----
 6 files changed, 29 insertions(+), 9 deletions(-)
 rename ccm-sci-types-project/web/{ => themes}/freemarker/ccm-sci-types-project.ftl (81%)

diff --git a/ccm-cms-types-decisiontree/application.xml b/ccm-cms-types-decisiontree/application.xml
index a4fba1679..a3e58e390 100644
--- a/ccm-cms-types-decisiontree/application.xml
+++ b/ccm-cms-types-decisiontree/application.xml
@@ -13,6 +13,7 @@
     <ccm:directory name="pdl"/>
     <ccm:directory name="sql"/>
     <ccm:directory name="src"/>
+    <ccm:directory name="web"/>
   </ccm:directories>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
diff --git a/ccm-cms-types-externallink/application.xml b/ccm-cms-types-externallink/application.xml
index fd43efa1d..07a4173ca 100644
--- a/ccm-cms-types-externallink/application.xml
+++ b/ccm-cms-types-externallink/application.xml
@@ -13,6 +13,7 @@
     <ccm:directory name="pdl"/>
     <ccm:directory name="sql"/>
     <ccm:directory name="src"/>
+    <ccm:directory name="web"/>
   </ccm:directories>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
diff --git a/ccm-cms-types-image/application.xml b/ccm-cms-types-image/application.xml
index 8c0c69ecd..47ef22aec 100755
--- a/ccm-cms-types-image/application.xml
+++ b/ccm-cms-types-image/application.xml
@@ -13,6 +13,7 @@
     <ccm:directory name="pdl"/>
     <ccm:directory name="sql"/>
     <ccm:directory name="src"/>
+    <ccm:directory name="web"/>
   </ccm:directories>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
diff --git a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
index 218a5a580..070f33b1f 100644
--- a/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
+++ b/ccm-cms/web/themes/freemarker/ccm-cms/orgaunit.ftl
@@ -72,6 +72,10 @@
     <#return member["contacts/contact[@contactType = $contact-type]/contactentries"]>
 </#function>
 
+<#function hasOrgaUnitContact data>
+    <#return (data["./contacts/contact"]?size > 0)>
+</#function>
+
 <#function getOrgaUnitContact data>
     <#return data["./contacts/contact[1]"]>
 </#function>
diff --git a/ccm-sci-types-project/application.xml b/ccm-sci-types-project/application.xml
index 924a1aae9..63a4e8986 100644
--- a/ccm-sci-types-project/application.xml
+++ b/ccm-sci-types-project/application.xml
@@ -10,11 +10,12 @@
         <ccm:requires name="ccm-core" version="6.6.3" relation="ge"/>  
         <ccm:requires name="ccm-cms" version="6.6.4" relation="ge"/>
     </ccm:dependencies>
-    <ccm:directories>
+    <!--<ccm:directories>
         <ccm:directory name="pdl"/>
         <ccm:directory name="sql"/>
         <ccm:directory name="src"/>
-    </ccm:directories>s
+        <ccm:directory name="web"/>
+    </ccm:directories>-->
     <ccm:contacts>
         <ccm:contact uri="http://www.scientificcms.org" type="website"/>
         <ccm:contact uri="mailto:info@scientificcms.org" type="support"/>
@@ -22,4 +23,4 @@
     <ccm:description>
         Content type for a (scientific) project.
     </ccm:description>
-</ccm:application>
\ No newline at end of file
+</ccm:application>
diff --git a/ccm-sci-types-project/web/freemarker/ccm-sci-types-project.ftl b/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
similarity index 81%
rename from ccm-sci-types-project/web/freemarker/ccm-sci-types-project.ftl
rename to ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
index f1aac8a4b..cb51835ff 100644
--- a/ccm-sci-types-project/web/freemarker/ccm-sci-types-project.ftl
+++ b/ccm-sci-types-project/web/themes/freemarker/ccm-sci-types-project.ftl
@@ -11,7 +11,7 @@
     <#elseif (item["./lifeSpan/begin"])>
         <#return item["./lifeSpan/begin"]>
     <#elseif (item["./nav:attribute[@name = 'projectBegin']"])>
-        <#return ./nav:attribute[@name = 'projectBegin']"]>
+        <#return item["./nav:attribute[@name = 'projectBegin']"]>
     </#if>
 </#function>
 
@@ -21,7 +21,7 @@
     <#elseif (item["./lifeSpan/end"])>
         <#return item["./lifeSpan/end"]>
     <#elseif (item["./nav:attribute[@name = 'projectEnd']"])>
-        <#return ./nav:attribute[@name = 'projectEnd']"]>
+        <#return item["./nav:attribute[@name = 'projectEnd']"]>
     </#if>
 </#function>
 
@@ -34,11 +34,11 @@
 </#function>
 
 <#function getShortDescription item>
-    <#if (item["./projectShortDesc"])>
+    <#if (item["./projectShortDesc"]?size > 0)>
         <#return item["./projectShortDesc"]>
-    <#elseif (item["./shortDesc"])>
+    <#elseif (item["./shortDesc"]?size > 0)>
         <#return item["./shortDesc"]>
-    <#elseif (item["./"])>
+    <#elseif (item["./"]?size > 0)>
         <#return item["./shortDescription"]>
     </#if>
 </#function>
@@ -51,6 +51,10 @@
     <#return sponsor["."]>
 </#function>
 
+<#function hasSponsorFundingCode sponsor>
+    <#return (sponsor["./@fundingCode"]?size > 0)>
+</#function>
+
 <#function getSponsorFundingCode sponsor>
     <#return sponsor["./@fundingCode"]>
 </#function>
@@ -59,10 +63,18 @@
     <#return sponsor["./@href"]>
 </#function>
 
+<#function hasFunding item>
+    <#return (item["./funding"]?size > 0)>
+</#function>
+
 <#function getFunding item>
     <#return item["./funding"]>
 </#function>
 
+<#function hasFundingVolume item>
+    <#return (item["./fundingVolume"]?size > 0)>
+</#function>
+
 <#function getFundingVolume item>
     <#return item["./fundingVolume"]>
 </#function>
@@ -112,6 +124,6 @@
 </#function>
 
 <#function getInvolvedOrganizationLink orga>
-    <#return orga["./links[1]/targetURI]>
+    <#return orga["./links[1]/targetURI"]>
 </#function>