diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-02 19:11:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 19:11:17 +0100 |
| commit | d9e30efa5ecc87bc9be7b2e28baaf34bd01032f5 (patch) | |
| tree | a2bb52cd8418feb062b908dfaf98d00a3c0ccbbe /app/controllers/admin | |
| parent | 0b8fe020b599341d78cc03431eb156485c70ebea (diff) | |
| parent | 78781793d5ab370829d7eaee4b8d21994f84763c (diff) | |
Merge pull request #1709 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/reports/actions_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/reports/actions_controller.rb b/app/controllers/admin/reports/actions_controller.rb index 05a4fb63d..5cb5c744f 100644 --- a/app/controllers/admin/reports/actions_controller.rb +++ b/app/controllers/admin/reports/actions_controller.rb @@ -7,7 +7,7 @@ class Admin::Reports::ActionsController < Admin::BaseController authorize @report, :show? case action_from_button - when 'delete' + when 'delete', 'mark_as_sensitive' status_batch_action = Admin::StatusBatchAction.new( type: action_from_button, status_ids: @report.status_ids, @@ -41,6 +41,8 @@ class Admin::Reports::ActionsController < Admin::BaseController def action_from_button if params[:delete] 'delete' + elsif params[:mark_as_sensitive] + 'mark_as_sensitive' elsif params[:silence] 'silence' elsif params[:suspend] |