diff options
author | ThibG <thib@sitedethib.com> | 2019-02-19 22:42:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-19 22:42:22 +0100 |
commit | 787449c12f121737c4319ec274300fa9a330fe9b (patch) | |
tree | 766b37f3f093f3882aba2258ebc2748325edcfcb /app/views/admin/accounts/show.html.haml | |
parent | 896beb16c5318b8ce59867a06545ae6a00ccc84c (diff) | |
parent | ff0576cc2b046694dd8960608ce2f40e32a0ab78 (diff) |
Merge pull request #925 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/accounts/show.html.haml')
-rw-r--r-- | app/views/admin/accounts/show.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 280a834ba..7ac73bd07 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -166,6 +166,12 @@ - else = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account) + - unless @account.local? + - if DomainBlock.where(domain: @account.domain).exists? + = link_to t('admin.domain_blocks.undo'), 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' + %hr.spacer/ - unless @warnings.empty? |