diff --git a/lib/ransack/adapters/active_record/context.rb b/lib/ransack/adapters/active_record/context.rb index 3a4f6af..58da369 100644 --- a/lib/ransack/adapters/active_record/context.rb +++ b/lib/ransack/adapters/active_record/context.rb @@ -174,7 +174,7 @@ module Ransack found_association = list.detect do |assoc| assoc.reflection.name == name && - @associations_pot[assoc] == parent && + (@associations_pot.nil? || @associations_pot[assoc] == parent) && (!klass || assoc.reflection.klass == klass) end