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

[rails.git] / app / views / api / changesets / _changeset.json.jbuilder

diff --git a/app/views/api/changesets/_changeset.json.jbuilder b/app/views/api/changesets/_changeset.json.jbuilder
index 25b366011ce77db5ec66f36bc9ffc9bc0e8620b8..f0e46132008be266b51408ab0b948b649f8fdfc6 100644 (file)
--- a/app/views/api/changesets/_changeset.json.jbuilder
+++ b/app/views/api/changesets/_changeset.json.jbuilder
@@ -21,8 +21,10 @@ end
 
 json.tags changeset.tags unless changeset.tags.empty?
 
 
 json.tags changeset.tags unless changeset.tags.empty?
 

-if @include_discussion
-  json.comments(changeset.comments) do |comment|
+if @comments
+  json.comments(@comments) do |comment|
+    json.id comment.id
+    json.visible comment.visible

     json.date comment.created_at.xmlschema
     if comment.author.data_public?
       json.uid comment.author.id
     json.date comment.created_at.xmlschema
     if comment.author.data_public?
       json.uid comment.author.id