Bugfixes for several Freemarker function libraries

git-svn-id: https://svn.libreccm.org/ccm/trunk@6257 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-publicpersonalprofile/web/themes/freemarker/ccm-cms-publicpersonalprofile.ftl

@@ -2,11 +2,16 @@
 "bebop":"http://www.arsdigita.com/bebop/1.0",
 "cms":"http://www.arsdigita.com/cms/1.0",
 "nav":"http://ccm.redhat.com/navigation",
+"ppp":"http://www.arsdigita.com/PublicPersonalProfile/1.0",
 "ui": "http://www.arsdigita.com/ui/1.0"}
 >
 
+<#function getProfileOwnerFullName model>
+    <#return model["./ppp:profile/ppp:ownerName"]>
+</#function>
+
 <#function getProfileOwner data>
-    <#return data["./profileOwner"]>
+    <#return data["./profileOwner/owner"]>
 </#function>
 
 <#function getProfileOwnerSurname owner>
@@ -25,20 +30,20 @@
     <#return owner["./titlePost"]>
 </#function>
 
-<#function getProfilePosition>
+<#function getProfilePosition data>
     <#return data["./position"]>
 </#function>
 
-<#function getProfileInterests>
+<#function getProfileInterests data>
     <#return data["./interests"]>
 </#function>
 
-<#function getProfileMisc>
+<#function getProfileMisc data>
     <#return data["./misc"]>
 </#function>
 
 <#function getProfileOwnerContact owner>
-    <#return owner["./contact"]>
+    <#return owner["./contacts/contact"]>
 </#function>
 
 <#function getProfileImage data>
@@ -49,6 +54,17 @@
     </#if>
 </#function>
 
+<#function getProfileImageUrl data>
+
+    <#if (data["./ppp:profile/ppp:profileImage"]?size > 0)>
+        <#assign imageId=data["./ppp:profile/ppp:profileImage/imageAttachments[1]/image/id"]>
+        <#return dispatcherPrefix + '/cms-service/stream/image/?image_id=' + imageId>
+    <#elseif (data["./nav:greetingdata/cms:data/profileOwner/owner/imageAttachments"]?size > 0)>
+        <#assign imageId=data["./nav:greetingdata/cms:data/profileOwner/owner/imageAttachments[1]/image/id"]>
+        <#return dispatcherPrefix + '/cms-service/stream/image/?image_id=' + imageId>
+    </#if>
+</#function>
+
 <#function getProfileOwnerName data>
     <#return data["./ppp:profile/ppp:ownerName"]>
 </#function>

ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl

@@ -6,7 +6,7 @@
 >
 
 <#function getAddress item>
-    <#return item["./address/address"]>
+    <#return item["./address"]>
 </#function>
 
 <#function getPerson item>
@@ -25,6 +25,10 @@
     <#return entry["./key"]>
 </#function>
 
+<#function getContactEntryKey entry>
+    <#return entry["./key"]>
+</#function>
+
 <#function getContactEntryValue entry>
     <#return entry["./value"]>
 </#function>