X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2ddd667910301e73a9961ffd70b72011f1dfb22a..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/app/views/notes/_note.xml.builder?ds=sidebyside diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder index 259f70405..adb4e6a52 100644 --- 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.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" - xml.date_closed note.closed_at - end + xml.date_closed note.closed_at if note.closed? xml.comments do note.comments.each do |comment| @@ -18,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 - 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 + xml.action comment.event + if comment.body xml.text comment.body.to_text xml.html comment.body.to_html