cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check recipient condition separately for message header/footer

Browse source
This commit is contained in:
Anton Khorev 2023-08-10 20:38:49 +03:00
parent 2d677df6e2
commit de8a60a3e3
1 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/views/messages/show.html.erb
View file

@ -2,36 +2,29 @@
<h1><%= @message.title %></h1>
<% end %>
<% if current_user == @message.recipient %>
<div class='info-line d-flex gap-1 flex-wrap'>
<div class='info-line d-flex gap-1 flex-wrap'>
<% if current_user == @message.recipient %>
<%= user_thumbnail_tiny @message.sender %>
<%= link_to @message.sender.display_name, user_path(@message.sender) %></td>
<span class="ms-auto">
<%= l @message.sent_on, :format => :friendly %>
</span>
</div>
<%= link_to @message.sender.display_name, user_path(@message.sender) %>
<% else %>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
<% end %>
<span class="ms-auto">
<%= l @message.sent_on, :format => :friendly %>
</span>
</div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div>
<div>
<% if current_user == @message.recipient %>
<%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
<%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
<%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
<%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
</div>
<% else %>
<div class='info-line d-flex gap-1 flex-wrap'>
<%= user_thumbnail_tiny @message.recipient %>
<%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>
<span class="ms-auto">
<%= l @message.sent_on, :format => :friendly %>
</span>
</div>
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div>
<% else %>
<%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
<%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
</div>
<% end %>
<% end %>
</div>