gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 09:51:24 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Wording improvement on transparent upgrade

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-21 11:17:51 -04:00
parent 7c2847e12d
commit 66d282ea5e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/admin/domain_blocks_controller.rb
View File

@ -7,7 +7,7 @@ module Admin
with_options only: :create do with_options only: :create do
before_action :populate_domain_block_from_params before_action :populate_domain_block_from_params
before_action :prevent_downgrade before_action :prevent_downgrade
before_action :attempt_transparent_upgrade, if: :existing_domain_block before_action :perform_transparent_upgrade, if: :existing_domain_block_matches_domain?
before_action :verify_confirmation_needed before_action :verify_confirmation_needed
end end
@ -98,12 +98,15 @@ module Admin
end end
end end
def attempt_transparent_upgrade def perform_transparent_upgrade
# Allow transparently upgrading a domain block when existing is an exact match for domain value @domain_block = existing_domain_block
if existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain.strip) @domain_block.assign_attributes(resource_params)
@domain_block = existing_domain_block end
@domain_block.assign_attributes(resource_params)
end def existing_domain_block_matches_domain?
# Existing domain block exists and the domain is exact match for the value from incoming params
existing_domain_block.present? &&
existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain.strip)
end end
def verify_confirmation_needed def verify_confirmation_needed