Merge remote-tracking branch 'upstream/pull/5053'

[rails.git] / app / views / api / notes / _note.json.jbuilder

diff --git a/app/views/api/notes/_note.json.jbuilder b/app/views/api/notes/_note.json.jbuilder
index 34f79688073249d00b7edf78cff1b05198ab77de..0884c4426d9e3802b4abf352de108e19411e735d 100644 (file)
--- a/app/views/api/notes/_note.json.jbuilder
+++ b/app/views/api/notes/_note.json.jbuilder
@@ -7,13 +7,13 @@ end
 
 json.properties do
   json.id note.id
 
 json.properties do
   json.id note.id

-  json.url note_url(note, :format => params[:format])
+  json.url api_note_url(note, :format => params[:format])

 
   if note.closed?
 
   if note.closed?

-    json.reopen_url reopen_note_url(note, :format => params[:format])
+    json.reopen_url reopen_api_note_url(note, :format => params[:format])

   else
   else

-    json.comment_url comment_note_url(note, :format => params[:format])
-    json.close_url close_note_url(note, :format => params[:format])
+    json.comment_url comment_api_note_url(note, :format => params[:format])
+    json.close_url close_api_note_url(note, :format => params[:format])

   end
 
   json.date_created note.created_at.to_s
   end
 
   json.date_created note.created_at.to_s