From e28b33c89c9a4c6baa79cedb5d6db1ed612710af Mon Sep 17 00:00:00 2001 From: unarist Date: Fri, 17 Nov 2017 23:18:20 +0900 Subject: [PATCH] Move "Permissions" row into main table in /admin/accounts/:id (#5734) --- app/views/admin/accounts/show.html.haml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index f495948281..ddb1cf15d9 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -15,6 +15,12 @@ %td= @account.display_name - if @account.local? + %tr + %th= t('admin.accounts.role') + %td + = t("admin.accounts.roles.#{@account.user&.role}") + = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user) + = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user) %tr %th= t('admin.accounts.email') %td @@ -145,20 +151,6 @@ %th= t('admin.accounts.followers_url') %td= link_to @account.followers_url, @account.followers_url -- else - %hr - - .table-wrapper - %table.table - %tbody - %tr - %th= t('admin.accounts.role') - %td - = t("admin.accounts.roles.#{@account.user&.role}") - %td< - = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user) - = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user) - %hr %h3= t('admin.accounts.moderation_notes')