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 ba9ccd944e663707cec48978b2b180a7ad549e4d..f252a0dfc41b930c4e00e4aae0503f3eebe14f78 100644 (file)
--- a/app/views/notes/_note.json.jsonify
+++ b/app/views/notes/_note.json.jsonify
@@ -7,8 +7,10 @@ end
 
 json.properties do
   json.id note.id
 
 json.properties do
   json.id note.id

+  json.url note_url(note, :format => params[:format])
+  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.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.status note.status
   json.closed_at note.closed_at if note.status == "closed"