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

Change block end column to display strictly ends_at

Browse source 
Could display when block was viewed before. That's going to be unintuitive if sorting by different times is introduced.
This commit is contained in:
Anton Khorev 2023-08-24 05:35:53 +03:00
parent 30da09c5a1
commit 156c526c22
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/helpers/user_blocks_helper.rb
View file

@ -29,16 +29,20 @@ module UserBlocksHelper
if block.active?
if block.needs_view?
if block.ends_at > Time.now.utc
t("user_blocks.helper.short.until_end_and_login")
t("user_blocks.helper.short.active_unread")
else
t("user_blocks.helper.short.until_login")
t("user_blocks.helper.short.expired_unread")
end
else
t("user_blocks.helper.short.until_end")
t("user_blocks.helper.short.active")
end
else
if block.revoker_id.nil?
t("user_blocks.helper.short.ended")
if block.updated_at > block.ends_at
t("user_blocks.helper.short.read_html", :time => block_short_time_in_past(block.updated_at))
else
t("user_blocks.helper.short.ended")
end
else
t("user_blocks.helper.short.revoked_html", :name => link_to(block.revoker.display_name, block.revoker,
:class => "username d-inline-block text-truncate text-wrap align-bottom",