diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-07 20:20:23 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-07 20:20:23 +0200 |
| commit | bced70469a6c4aecdb3c71055f329a0f579eb14c (patch) | |
| tree | 39028440b4ddc2e775369a41b86da5657a40c347 /app/views/admin/accounts | |
| parent | 94c54997cf6dc3bef2af67a070a61cc10595339c (diff) | |
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
Diffstat (limited to 'app/views/admin/accounts')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 7494c9fa2..59babd3b0 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -174,7 +174,7 @@ - unless @account.local? - if DomainBlock.where(domain: @account.domain).exists? - = link_to t('admin.domain_blocks.undo'), admin_instance_path(@account.domain), class: 'button' + = link_to t('admin.domain_blocks.view'), admin_instance_path(@account.domain), class: 'button' - else = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive' |