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 2a2b2ffc124f5a9c7eddcf47e5efe71f416955a5..adb4e6a5233350f7cb29b477ab283ee849886b3b 100644 (file)
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -1,21 +1,37 @@
 xml.note("lon" => note.lon, "lat" => note.lat) do
   xml.id note.id
 xml.note("lon" => note.lon, "lat" => note.lat) do
   xml.id note.id

+  xml.url 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.date_created note.created_at

-  xml.nearby note.nearby_place

   xml.status note.status
 
   xml.status note.status
 

-  if note.status == "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.comment do
         xml.date comment.created_at
 
   xml.comments 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, :only_path => false)
+        end
+
+        xml.action comment.event
+
+        if comment.body
+          xml.text comment.body.to_text
+          xml.html comment.body.to_html
+        end
+      end

     end
   end
 end
     end
   end
 end