X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..029f9217e9cf0b20a958b27c51f19ee4e1f38b29:/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 c00b49c73..ee9570205 100644 --- a/app/views/notes/_note.xml.builder +++ b/app/views/notes/_note.xml.builder @@ -1,13 +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.nearby note.nearby_place xml.status note.status - if note.status == "closed" + if note.closed? xml.date_closed note.closed_at end @@ -15,10 +20,20 @@ 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, :host => SERVER_URL) + 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