From e0afe80f69310411b60ba869bbe6d1aafd3912d3 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 21 Sep 2021 17:16:35 -0700 Subject: [PATCH] Fixed scope_attributes - #1511 --- lib/searchkick/model.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb index fe8d14e..edc6360 100644 --- a/lib/searchkick/model.rb +++ b/lib/searchkick/model.rb @@ -57,11 +57,14 @@ module Searchkick alias_method :search_index, :searchkick_index unless method_defined?(:search_index) def searchkick_reindex(method_name = nil, **options) - # TODO relation = Searchkick.relation?(self) - relation = (respond_to?(:current_scope) && respond_to?(:default_scoped) && current_scope && current_scope.to_sql != default_scoped.to_sql) || + # TODO scoped = Searchkick.relation?(self) + scoped = (respond_to?(:current_scope) && respond_to?(:default_scoped) && current_scope && current_scope.to_sql != default_scoped.to_sql) || (respond_to?(:queryable) && queryable != unscoped.with_default_scope) - searchkick_index.reindex(searchkick_klass, method_name, scoped: relation, **options) + relation = scoped ? all : searchkick_klass + unscoped do + searchkick_index.reindex(relation, method_name, scoped: scoped, **options) + end end alias_method :reindex, :searchkick_reindex unless method_defined?(:reindex) -- libgit2 0.21.0