Make user links in note API responses use the main server name

[rails.git] / app / views / notes / _note.json.jsonify

diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify
index 6afb4a555b9e5d0b1de6673563901a5781a597ab..985bcf79c6f8f7126ddecfbf466e165ab6ae0f91 100644 (file)
--- 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
@@ -11,15 +11,23 @@ json.properties do
   json.comment_url comment_note_url(note, :format => params[:format])
   json.close_url close_note_url(note, :format => params[:format])
   json.date_created note.created_at
-  json.nearby  note.nearby_place
   json.status note.status
   json.closed_at note.closed_at if note.status == "closed"
 
   json.comments(note.comments) do |comment|
     json.date comment.created_at
-    json.uid comment.author_id unless comment.author_id.nil?
-    json.user comment.author_name
+
+    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, :host => SERVER_URL)
+    end
+
     json.action comment.event
-    json.text comment.body unless comment.body.nil?
+
+    if comment.body
+      json.text comment.body.to_text
+      json.html comment.body.to_html
+    end
   end
 end