diff --git a/lib/avo/base_resource.rb b/lib/avo/base_resource.rb index 240847f710..62b3b50c03 100644 --- a/lib/avo/base_resource.rb +++ b/lib/avo/base_resource.rb @@ -14,7 +14,6 @@ class BaseResource include Avo::Concerns::HasHelpers include Avo::Concerns::Hydration include Avo::Concerns::Pagination - include ActionView::Helpers::SanitizeHelper # Avo::Current methods delegate :context, to: Avo::Current diff --git a/lib/avo/concerns/pagination.rb b/lib/avo/concerns/pagination.rb index 5d382d0fc5..e8f98c0fca 100644 --- a/lib/avo/concerns/pagination.rb +++ b/lib/avo/concerns/pagination.rb @@ -38,8 +38,8 @@ def apply_pagination(index_params:, query:) send PAGINATION_METHOD[pagination_type.to_sym], query, items: index_params[:per_page], - link_extra: "data-turbo-frame=\"#{sanitize(params[:turbo_frame])}\"", # Add extra arguments in pagy 7. - anchor_string: "data-turbo-frame=\"#{sanitize(params[:turbo_frame])}\"", # Add extra arguments in pagy 8. + link_extra: "data-turbo-frame=\"#{ActionView::Base.full_sanitizer.sanitize(params[:turbo_frame])}\"", # Add extra arguments in pagy 7. + anchor_string: "data-turbo-frame=\"#{ActionView::Base.full_sanitizer.sanitize(params[:turbo_frame])}\"", # Add extra arguments in pagy 8. params: extra_pagy_params, size: pagination_hash[:size] end