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:
ThibG
2019-08-07 20:20:23 +02:00
committed by Eugen Rochko
parent 94c54997cf
commit bced70469a
17 changed files with 138 additions and 34 deletions

View File

@ -31,6 +31,18 @@
= fa_icon 'times'
.dashboard__counters__label= t 'admin.instances.delivery_available'
- if @private_comment.present?
.speech-bubble
.speech-bubble__bubble
= simple_format(h(@private_comment))
.speech-bubble__owner= t 'admin.instances.private_comment'
- if @public_comment.present?
.speech-bubble
.speech-bubble__bubble
= simple_format(h(@public_comment))
.speech-bubble__owner= t 'admin.instances.public_comment'
%hr.spacer/
%div{ style: 'overflow: hidden' }
@ -41,6 +53,7 @@
- if @domain_allow
= link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
- elsif @domain_block
= link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@domain_block), class: 'button'
= link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button'
- else
= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'