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

[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 c702d9254b49aa886426887da8faf84fcf5b4b94..b964399225350d30cf48aa7786e0c4eda41d9fb7 100644 (file)
--- a/app/views/notes/_note.json.jsonify
+++ b/app/views/notes/_note.json.jsonify
@@ -2,17 +2,23 @@ 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.to_f, note.lat.to_f ]

 end
 
 json.properties do
   json.id note.id
   json.url note_url(note, :format => params[:format])
 end
 
 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])
+
+  if note.closed?
+    json.reopen_url reopen_note_url(note, :format => params[:format])
+  else
+    json.comment_url comment_note_url(note, :format => params[:format])
+    json.close_url close_note_url(note, :format => params[:format])
+  end
+

   json.date_created note.created_at
   json.status note.status
   json.date_created note.created_at
   json.status note.status

-  json.closed_at note.closed_at if note.status == "closed"
+  json.closed_at note.closed_at if note.closed?

 
   json.comments(note.comments) do |comment|
     json.date comment.created_at
 
   json.comments(note.comments) do |comment|
     json.date comment.created_at


@@ -20,7 +26,7 @@ json.properties do
     if comment.author
       json.uid comment.author.id
       json.user comment.author.display_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)
+      json.user_url user_url(:display_name => comment.author.display_name, :only_path => false)

     end
 
     json.action comment.event
     end
 
     json.action comment.event