Merge branch 'master' into notes

[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 f252a0dfc41b930c4e00e4aae0503f3eebe14f78..c702d9254b49aa886426887da8faf84fcf5b4b94 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.geometry do
   json.type "Point"

-  json.coordinates [ note.lon, note.lat ]              
+  json.coordinates [ note.lon, note.lat ]

 end
 
 json.properties do
 end
 
 json.properties do


@@ -16,9 +16,18 @@ json.properties do
 
   json.comments(note.comments) do |comment|
     json.date comment.created_at
 
   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)
+    end
+

     json.action comment.event
     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
   end
 end