diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-11-05 04:45:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:45:01 +0100 |
| commit | d6fe0c94ca48a10d579cf5ec321c33c6124b402d (patch) | |
| tree | 72d8e135bf9642a6115eb244490256d610a007f8 /app/controllers | |
| parent | f90620b2f3bb92104c8878140aa00651a255a647 (diff) | |
Add account sensitized (#14361)
* Add account sensitized * Fix i18n normalize * Fix description and spec * Fix spec * Fix wording
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/api/v1/admin/accounts_controller.rb | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index b9b75727d..1dd7430e0 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -53,6 +53,13 @@ module Admin redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.destroyed_msg', username: @account.acct) end + def unsensitive + authorize @account, :unsensitive? + @account.unsensitize! + log_action :unsensitive, @account + redirect_to admin_account_path(@account.id) + end + def unsilence authorize @account, :unsilence? @account.unsilence! diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb index 3af572f25..63cc521ed 100644 --- a/app/controllers/api/v1/admin/accounts_controller.rb +++ b/app/controllers/api/v1/admin/accounts_controller.rb @@ -22,6 +22,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController active pending disabled + sensitized silenced suspended username @@ -68,6 +69,13 @@ class Api::V1::Admin::AccountsController < Api::BaseController render json: @account, serializer: REST::Admin::AccountSerializer end + def unsensitive + authorize @account, :unsensitive? + @account.unsensitize! + log_action :unsensitive, @account + render json: @account, serializer: REST::Admin::AccountSerializer + end + def unsilence authorize @account, :unsilence? @account.unsilence! |