diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-04 11:07:01 -0600 |
| commit | d9800a5647cbc57db7679094b2271f8eb5ec328b (patch) | |
| tree | f9210c465de5f9d80e294d9ffa8536f98f9c466e /app/controllers/admin/statuses_controller.rb | |
| parent | 1c74ede69e7a9916c19da6f05daa215231eba81c (diff) | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
Merge branch 'gs-master' into glitch-theme
Diffstat (limited to 'app/controllers/admin/statuses_controller.rb')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index b54a9b824..5d4325f57 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -26,7 +26,7 @@ module Admin def create authorize :status, :update? - @form = Form::StatusBatch.new(form_status_batch_params) + @form = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account)) flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save redirect_to admin_account_statuses_path(@account.id, current_params) @@ -34,13 +34,15 @@ module Admin def update authorize @status, :update? - @status.update(status_params) + @status.update!(status_params) + log_action :update, @status redirect_to admin_account_statuses_path(@account.id, current_params) end def destroy authorize @status, :destroy? RemovalWorker.perform_async(@status.id) + log_action :destroy, @status render json: @status end |