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

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

Browse source
This commit is contained in:
Tom Hughes 2024-04-30 18:34:43 +01:00
commit 56a57e7f29
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/messages.js
View file

@ -5,7 +5,7 @@ $(document).ready(function () {
} }
}); });
$(".messages-table .message-summary").on("turbo:before-morph-element", function (event) { $(".messages-table tbody tr").on("turbo:before-morph-element", function (event) {
if ($(event.target).find("[data-is-destroyed]").length > 0) { if ($(event.target).find("[data-is-destroyed]").length > 0) {
event.preventDefault(); // NB: prevent Turbo from morhping/removing this element event.preventDefault(); // NB: prevent Turbo from morhping/removing this element
$(event.target).fadeOut(800, "linear", function () { $(event.target).fadeOut(800, "linear", function () {

2
app/views/messages/_message_summary.html.erb
View file

@ -1,4 +1,4 @@
<%= tag.tr(:id => "inbox-#{message.id}", :class => { "message-summary" => true, "table-success" => !message.message_read? }) do %> <%= tag.tr(:id => "inbox-#{message.id}", :class => { "table-success" => !message.message_read? }) do %>
<td><%= link_to message.sender.display_name, user_path(message.sender) %></td> <td><%= link_to message.sender.display_name, user_path(message.sender) %></td>
<td><%= link_to message.title, message_path(message) %></td> <td><%= link_to message.title, message_path(message) %></td>
<td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td> <td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td>

2
app/views/messages/_sent_message_summary.html.erb
View file

@ -1,4 +1,4 @@
<%= tag.tr(:id => "outbox-#{message.id}", :class => { "message-summary" => true }) do %> <%= tag.tr(:id => "outbox-#{message.id}") do %>
<td><%= link_to message.recipient.display_name, user_path(message.recipient) %></td> <td><%= link_to message.recipient.display_name, user_path(message.recipient) %></td>
<td><%= link_to message.title, message_path(message) %></td> <td><%= link_to message.title, message_path(message) %></td>
<td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td> <td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td>