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 7e4585f86fbacaf37498337ab48a7d2c2d5dac9f..adb4e6a5233350f7cb29b477ab283ee849886b3b 100644 (file)
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -1,14 +1,18 @@
 xml.note("lon" => note.lon, "lat" => note.lat) do
   xml.id note.id
   xml.url note_url(note, :format => params[:format])
 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
 
   xml.date_created note.created_at
   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.comments do
     note.comments.each do |comment|


@@ -18,10 +22,15 @@ 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)
+          xml.user_url user_url(:display_name => comment.author.display_name, :only_path => false)

         end
 
         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
       end
     end
   end