Add domain block notes (#11515)
* Add database columns for adding notes to domain blocks/restrctions * Add admin UI to set private and public comments when blocking a domain * Add text for private and public comments on domain blocks * Show domain block comments in admin UI * Add comments to the domain block undo page * Make UnblockDomainService more robust regarding upgraded domain blocks * Allow editing domain blocks * Rename button from “undo domain block” to “view domain block” in account admin UI * Change test to unsilence silenced users from upgraded blocks
This commit is contained in:
@ -284,6 +284,7 @@ en:
|
||||
created_msg: Domain block is now being processed
|
||||
destroyed_msg: Domain block has been undone
|
||||
domain: Domain
|
||||
edit: Edit domain block
|
||||
existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
|
||||
new:
|
||||
create: Create block
|
||||
@ -294,6 +295,10 @@ en:
|
||||
silence: Silence
|
||||
suspend: Suspend
|
||||
title: New domain block
|
||||
private_comment: Private comment
|
||||
private_comment_hint: Comment about this domain limitation for internal use by the moderators.
|
||||
public_comment: Public comment
|
||||
public_comment_hint: Comment about this domain limitation for the general public, if advertising the list of domain limitations is enabled.
|
||||
reject_media: Reject media files
|
||||
reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
|
||||
reject_reports: Reject reports
|
||||
@ -313,6 +318,7 @@ en:
|
||||
title: Undo domain block for %{domain}
|
||||
undo: Undo
|
||||
undo: Undo domain block
|
||||
view: View domain block
|
||||
email_domain_blocks:
|
||||
add_new: Add new
|
||||
created_msg: Successfully added e-mail domain to blacklist
|
||||
@ -336,6 +342,8 @@ en:
|
||||
all: All
|
||||
limited: Limited
|
||||
title: Moderation
|
||||
private_comment: Private comment
|
||||
public_comment: Public comment
|
||||
title: Federation
|
||||
total_blocked_by_us: Blocked by us
|
||||
total_followed_by_them: Followed by them
|
||||
|
@ -155,7 +155,11 @@ Rails.application.routes.draw do
|
||||
get '/dashboard', to: 'dashboard#index'
|
||||
|
||||
resources :domain_allows, only: [:new, :create, :show, :destroy]
|
||||
resources :domain_blocks, only: [:new, :create, :show, :destroy]
|
||||
resources :domain_blocks, only: [:new, :create, :show, :destroy, :update] do
|
||||
member do
|
||||
get :edit
|
||||
end
|
||||
end
|
||||
resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
|
||||
resources :action_logs, only: [:index]
|
||||
resources :warning_presets, except: [:new]
|
||||
|
Reference in New Issue
Block a user