Merge remote-tracking branch 'openstreetmap/pull/1395'

[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 f8872c717c184c9da9aab84e79150dd1075d242f..5e3ac518e7840990e78654089f06f6433952441f 100644 (file)
--- a/app/views/notes/_note.json.jsonify
+++ b/app/views/notes/_note.json.jsonify
@@ -18,7 +18,7 @@ json.properties do
 
   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


@@ -26,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, :host => SERVER_URL)
+      json.user_url user_url(:display_name => comment.author.display_name, :only_path => false)

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