Add isRoot() method to Album, only dump album ID in sone.xml if the parent is not...

[Sone.git] / src / main / resources / templates / insert / sone.xml

diff --git a/src/main/resources/templates/insert/sone.xml b/src/main/resources/templates/insert/sone.xml
index 2e4f298..3d456d4 100644 (file)
--- a/src/main/resources/templates/insert/sone.xml
+++ b/src/main/resources/templates/insert/sone.xml
@@ -16,6 +16,7 @@
                <birth-day><% currentSone.profile.birthDay|xml></birth-day>
                <birth-month><% currentSone.profile.birthMonth|xml></birth-month>
                <birth-year><% currentSone.profile.birthYear|xml></birth-year>
+               <avatar><%currentSone.profile.avatar|xml></avatar>
                <fields>
                        <%foreach currentSone.profile.fields field>
                        <field>
@@ -30,7 +31,7 @@
                <%foreach currentSone.posts post>
                <post>
                        <id><% post.id|xml></id>
-                       <recipient><%ifnull !post.recipient><% post.recipient.id|xml><%/if></recipient>
+                       <recipient><%if post.recipientId.present><% post.recipientId.get|xml><%/if></recipient>
                        <time><% post.time></time>
                        <text><% post.text|xml></text>
                </post>
@@ -41,7 +42,7 @@
                <%foreach currentSone.replies reply>
                <reply>
                        <id><% reply.id></id>
-                       <post-id><% reply.post.id|xml></post-id>
+                       <post-id><% reply.postId|xml></post-id>
                        <time><% reply.time></time>
                        <text><% reply.text|xml></text>
                </reply>
@@ -66,7 +67,7 @@
                <%/first>
                <album>
                        <id><%album.id|xml></id>
-                       <%ifnull !album.parent>
+                       <%if !album.parent.root>
                        <parent><%album.parent.id|xml></parent>
                        <%/if>
                        <title><%album.title|xml></title>