Merge branch 'master' into notes

[rails.git] / app / views / notes / _note.xml.builder

diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder
index c00b49c73ba95d5857c5801a5236bdced5e17a82..259f70405790cfac915f6f8c25b7edd4480e9dbb 100644 (file)
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -2,9 +2,8 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
   xml.id note.id
   xml.url note_url(note, :format => params[:format])
   xml.comment_url comment_note_url(note, :format => params[:format])
-  xml.close_url close_note_url(note, :format => params[:format])  
+  xml.close_url close_note_url(note, :format => params[:format])
   xml.date_created note.created_at
-  xml.nearby note.nearby_place
   xml.status note.status
 
   if note.status == "closed"
@@ -15,10 +14,18 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
     note.comments.each do |comment|
       xml.comment do
         xml.date comment.created_at
-        xml.uid comment.author_id unless comment.author_id.nil?
-        xml.user comment.author_name
-        xml.text comment.body
-      end      
+
+        if comment.author
+          xml.uid comment.author.id
+          xml.user comment.author.display_name
+          xml.user_url user_url(:display_name => comment.author.display_name)
+        end
+
+        if comment.body
+          xml.text comment.body.to_text
+          xml.html comment.body.to_html
+        end
+      end
     end
   end
 end