X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9477d7a65e03b895a8d30a4586449e76c1ea4758..1ba4fdd3e1553c271b07c9692e185b00ce95a470:/app/views/notes/_note.xml.builder?ds=inline

diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder
index 7e4585f86..ee9570205 100644
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -1,12 +1,18 @@
 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])
+
+  if note.closed?
+    xml.reopen_url reopen_note_url(note, :format => params[:format])
+  else
+    xml.comment_url comment_note_url(note, :format => params[:format])
+    xml.close_url close_note_url(note, :format => params[:format])
+  end
+
   xml.date_created note.created_at
   xml.status note.status
 
-  if note.status == "closed"
+  if note.closed?
     xml.date_closed note.closed_at
   end
 
@@ -18,10 +24,15 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
         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)
+          xml.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL)
         end
 
-        xml.text comment.body
+        xml.action comment.event
+
+        if comment.body
+          xml.text comment.body.to_text
+          xml.html comment.body.to_html
+        end
       end
     end
   end