Merge remote-tracking branch 'upstream/pull/1973'

[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 2b978e325f116b4d8effbccaf772fa689f268ed7..adb4e6a5233350f7cb29b477ab283ee849886b3b 100644 (file)
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -12,9 +12,7 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
   xml.date_created note.created_at
   xml.status note.status
 
   xml.date_created note.created_at
   xml.status note.status
 

-  if note.closed?
-    xml.date_closed note.closed_at
-  end
+  xml.date_closed note.closed_at if note.closed?

 
   xml.comments do
     note.comments.each do |comment|
 
   xml.comments do
     note.comments.each do |comment|


@@ -24,9 +22,11 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
         if comment.author
           xml.uid comment.author.id
           xml.user comment.author.display_name
         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, :host => SERVER_URL)
+          xml.user_url user_url(:display_name => comment.author.display_name, :only_path => false)

         end
 
         end
 

+        xml.action comment.event
+

         if comment.body
           xml.text comment.body.to_text
           xml.html comment.body.to_html
         if comment.body
           xml.text comment.body.to_text
           xml.html comment.body.to_html