From 59a4304cf1f18f44463f200501b9a707e4feb520 Mon Sep 17 00:00:00 2001 From: Wojciech Zygmuntowicz Date: Sun, 13 Oct 2024 18:11:44 +0200 Subject: [PATCH] Move wrap_io_params callback setup from concern to controllers --- app/controllers/concerns/motor/wrap_io_params.rb | 6 ------ .../motor/active_storage_attachments_controller.rb | 2 ++ app/controllers/motor/data_controller.rb | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/concerns/motor/wrap_io_params.rb b/app/controllers/concerns/motor/wrap_io_params.rb index afa403b1..791ac18d 100644 --- a/app/controllers/concerns/motor/wrap_io_params.rb +++ b/app/controllers/concerns/motor/wrap_io_params.rb @@ -2,12 +2,6 @@ module Motor module WrapIoParams - extend ActiveSupport::Concern - - included do - before_action :wrap_io_params, only: %i[update create] - end - private def wrap_io_params(hash = params) diff --git a/app/controllers/motor/active_storage_attachments_controller.rb b/app/controllers/motor/active_storage_attachments_controller.rb index 7fe2d336..c1d83d2e 100644 --- a/app/controllers/motor/active_storage_attachments_controller.rb +++ b/app/controllers/motor/active_storage_attachments_controller.rb @@ -4,6 +4,8 @@ module Motor class ActiveStorageAttachmentsController < ApiBaseController include Motor::WrapIoParams + before_action :wrap_io_params, only: :create + wrap_parameters :data, except: %i[include fields] load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false diff --git a/app/controllers/motor/data_controller.rb b/app/controllers/motor/data_controller.rb index 7fabf898..352b707a 100644 --- a/app/controllers/motor/data_controller.rb +++ b/app/controllers/motor/data_controller.rb @@ -7,6 +7,8 @@ class DataController < ApiBaseController include Motor::WrapIoParams include Motor::LoadAndAuthorizeDynamicResource + before_action :wrap_io_params, only: %i[update create] + def index @resources = Motor::ApiQuery.call(@resources, params)