X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30da09c5a1d0a788c3becae49cdeee822c23b298..e89a78fff858d5db07f6959a39dd9655dc46008e:/app/views/user_blocks/_block.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index ef790103e..cbc2ee23c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -7,10 +7,10 @@ <% end %> <%= h truncate(block.reason) %> <%= block_short_time_in_past(block.created_at) %> - <% if block.active? %> + <% if block.ends_at > Time.now.utc %> <%= block_short_time_in_future(block.ends_at) %> <% else %> - <%= block_short_time_in_past([block.ends_at, block.updated_at].max) %> + <%= block_short_time_in_past(block.ends_at) %> <% end %> <%= h block_short_status(block) %> <%= link_to t(".show"), block %>