From e073f93bbd29b8925a617ee985c9254dc313a561 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Jul 2021 18:40:02 +0100 Subject: [PATCH] Ensure the message title shows in the heading for both sent and received messages I'm not sure why they were ever different. --- app/views/messages/show.html.erb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 3631467fd..33156f51f 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,8 +1,8 @@ -<% if current_user == @message.recipient %> - <% content_for :heading do %> -

<%= @message.title %>

- <% end %> +<% content_for :heading do %> +

<%= @message.title %>

+<% end %> +<% if current_user == @message.recipient %>
<%= user_thumbnail_tiny @message.sender %> <%= link_to @message.sender.display_name, user_path(@message.sender) %> @@ -11,7 +11,7 @@
-
<%= @message.body.to_html %>
+
<%= @message.body.to_html %>
<%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %> @@ -19,11 +19,7 @@ <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-primary" %> <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
- <% else %> - -

<%= @message.title %>

-
<%= user_thumbnail_tiny @message.recipient %> <%= link_to @message.recipient.display_name, user_path(@message.recipient) %> @@ -37,5 +33,4 @@
<%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
- <% end %> -- 2.45.1