@@ -18,9 +18,13 @@ module PolymorphicInclude res = self.send "#{func}_without_polymorphic_include", *args rescue ActiveRecord::EagerLoadPolymorphicError => e # remove the polymorph :includes and retry regular find + scope_includes = scope(:find)[:include] if scope(:find) and scope(:find).has_key?(:include) sym = e.message.split.last.sub(/^:/,'').to_sym - inc = options[:include] + inc = options[:include] || scope_includes logger.debug { "polymorph find triggered on: #{sym}, #{inc.inspect}" } + if inc.nil? + logger.debug {"#{func} couldn't find :include; so far #{poly_includes.inspect} from args #{args.inspect}"} + end # we preserve any sub_includes for the polymorph for use when doing the # polymorph find. This doesn't support recursive polymorph structures poly_sub_includes = nil lib/polymorphic_include.rb 5e6282e29e40c7aba4ebd45d963978ae0daa46c7 Sai Emrys github@saizai.com http://github.com/haruska/polymorphic_include/commit/42de2079e44d36437a343d3955728d6a6c6b6257 42de2079e44d36437a343d3955728d6a6c6b6257 2009-11-01T20:50:31-08:00 2009-11-01T20:50:31-08:00 patch to be compatible with polymorphic includes present in scopes (e.g. named_scope :foo, :include => :polything; or will_paginate + squirrel) 2da87577eadaf6628fb3d440740ec8da92071b2c Sai Emrys github@saizai.com