diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/controllers/admin/reported_statuses_controller.rb | |
parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/controllers/admin/reported_statuses_controller.rb')
-rw-r--r-- | app/controllers/admin/reported_statuses_controller.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb index 32434d30f..5a31adecf 100644 --- a/app/controllers/admin/reported_statuses_controller.rb +++ b/app/controllers/admin/reported_statuses_controller.rb @@ -5,7 +5,14 @@ module Admin include Authorization before_action :set_report - before_action :set_status + before_action :set_status, only: [:update, :destroy] + + def create + @form = Form::StatusBatch.new(form_status_batch_params) + flash[:alert] = t('admin.statuses.failed_to_execute') unless @form.save + + redirect_to admin_report_path(@report) + end def update @status.update(status_params) @@ -15,7 +22,7 @@ module Admin def destroy authorize @status, :destroy? RemovalWorker.perform_async(@status.id) - redirect_to admin_report_path(@report) + render json: @status end private @@ -24,6 +31,10 @@ module Admin params.require(:status).permit(:sensitive) end + def form_status_batch_params + params.require(:form_status_batch).permit(:action, status_ids: []) + end + def set_report @report = Report.find(params[:report_id]) end |