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

[rails.git] / app / views / api / changesets / _changeset.xml.builder

diff --git a/app/views/api/changesets/_changeset.xml.builder b/app/views/api/changesets/_changeset.xml.builder
index e0188a10e0914b5e9dd66fbd756c8a426df38e2f..08cfbbc79bc9d66065ef6b6ca3362502fe32ecae 100644 (file)
--- a/app/views/api/changesets/_changeset.xml.builder
+++ b/app/views/api/changesets/_changeset.xml.builder
@@ -24,11 +24,13 @@ xml.changeset(attrs) do |changeset_xml_node|
 
   # include discussion if requested
 
 
   # include discussion if requested
 

-  if @include_discussion
+  if @comments

     changeset_xml_node.discussion do |discussion_xml_node|
     changeset_xml_node.discussion do |discussion_xml_node|

-      changeset.comments.includes(:author).each do |comment|
+      @comments.each do |comment|

         cattrs = {
         cattrs = {

-          "date" => comment.created_at.xmlschema
+          "id" => comment.id,
+          "date" => comment.created_at.xmlschema,
+          "visible" => comment.visible

         }
         if comment.author.data_public?
           cattrs["uid"] = comment.author.id
         }
         if comment.author.data_public?
           cattrs["uid"] = comment.author.id