Merge branch 'master' into openstreetbugs

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

diff --git a/app/views/note/_note.json.jsonify b/app/views/note/_note.json.jsonify
index a6ef9792ebec92b07241fdaa6334a75e6b8459c2..ba9ccd944e663707cec48978b2b180a7ad549e4d 100644 (file)
--- a/app/views/note/_note.json.jsonify
+++ b/app/views/note/_note.json.jsonify
@@ -16,6 +16,7 @@ json.properties do
     json.date comment.created_at
     json.uid comment.author_id unless comment.author_id.nil?
     json.user comment.author_name
-    json.text comment.body
+    json.action comment.event
+    json.text comment.body unless comment.body.nil?
   end
 end