Changeset 332

Timestamp:

02/29/08 19:20:34 (7 months ago)

Author:

jk

Message:

Applied scope support patch by Tom Locke. Thanks!

Files:

• trunk/plugin/acts_as_ferret/lib/class_methods.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/ferret_find_methods.rb (modified) (1 diff)

trunk/plugin/acts_as_ferret/lib/class_methods.rb

@@ -147 +147 @@
-    # +conitions+ present in +find_options+.
-    def find_with_ferret(q, options = {}, find_options = {})
+      if scope(:find, :conditions)
+        if find_options[:conditions]
+          find_options[:conditions] = "(#{find_options[:conditions]}) AND (#{scope(:find, :conditions)})"
+        else
+          find_options[:conditions] = scope(:find, :conditions)
+        end
+      end
+
-      if options[:per_page]
-        options[:page] = options[:page] ? options[:page].to_i : 1

trunk/plugin/acts_as_ferret/lib/ferret_find_methods.rb

@@ -30 +30 @@
-      # count total_hits via sql when using conditions, multiple models, or when we're called
-      # from an ActiveRecord association.
- or caller.find{ |call| call =~ %r{active_record/associations} }
+
-        # chances are the ferret result count is not our total_hits value, so
-        # we correct this here.