From 9477d7a65e03b895a8d30a4586449e76c1ea4758 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 2 Dec 2012 16:38:59 +0000 Subject: [PATCH] Include a user URL in JSON and XML responses --- app/views/notes/_note.json.jsonify | 11 ++++++++--- app/views/notes/_note.xml.builder | 13 +++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify index ce9ddb4bf..5724dfd54 100644 --- a/app/views/notes/_note.json.jsonify +++ b/app/views/notes/_note.json.jsonify @@ -2,7 +2,7 @@ json.type "Feature" json.geometry do json.type "Point" - json.coordinates [ note.lon, note.lat ] + json.coordinates [ note.lon, note.lat ] end json.properties do @@ -16,8 +16,13 @@ json.properties do json.comments(note.comments) do |comment| json.date comment.created_at - json.uid comment.author.id unless comment.author.nil? - json.user comment.author.display_name unless comment.author.nil? + + if comment.author + json.uid comment.author.id + json.user comment.author.display_name + json.user_url user_url(:display_name => comment.author.display_name) + end + json.action comment.event json.text comment.body unless comment.body.nil? end diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder index 187772676..7e4585f86 100644 --- a/app/views/notes/_note.xml.builder +++ b/app/views/notes/_note.xml.builder @@ -2,7 +2,7 @@ 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]) + xml.close_url close_note_url(note, :format => params[:format]) xml.date_created note.created_at xml.status note.status @@ -14,10 +14,15 @@ 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.nil? - xml.user comment.author.display_name unless comment.author.nil? + + 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) + end + xml.text comment.body - end + end end end end -- 2.43.2