Merge pull request #13608 from opf/bug/47871-appsignal-performance-me…

…ssagescontrollershow [#47871] [AppSignal] Performance MessagesController#show
opf · Sep 4, 2023 · e63baa2 · e63baa2
2 parents d94e6fc + 386325c
commit e63baa2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -51,7 +51,7 @@ def show
 
     @replies = @topic
                .children
-               .includes(:author, :attachments, forum: :project)
+               .includes(:author, :attachments, :project, forum: :project)
                .order(created_at: :asc)
                .page(@offset)
                .per_page(per_page_param)

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
@@ -121,8 +121,10 @@ See COPYRIGHT and LICENSE files for more details.
         <div class="wiki op-uc-container">
           <%= format_text message, :content, attachments: message.attachments %>
         </div>
-        <% resource = message_attachment_representer(message) %>
-        <%= list_attachments(resource) %>
+        <% if message.attachments.any? %>
+          <% resource = message_attachment_representer(message) %>
+          <%= list_attachments(resource) %>
+        <% end %>
       </div>
     <% end %>
     <%= pagination_links_full @replies, per_page_links: false %>