From 79a5e5568563d7bff0734df845f8370bf8d4db67 Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Sun, 15 Apr 2012 20:54:01 -0300 Subject: [PATCH] Fixes for acts_as_solr_reloaded --- vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb | 1 + vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb index 7bf1763..c0ee086 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb +++ b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb @@ -300,6 +300,7 @@ module ActsAsSolr #:nodoc: end def after_save_reindex(associations, options = {}) + extend ActsAsSolr::CommonMethods Array(associations).each do |association| after_save do |ar| if options[:with] == :delayed_job diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb index a8f2f58..d2cceaa 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb +++ b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb @@ -30,11 +30,14 @@ module ActsAsSolr #:nodoc: end def solr_batch_add(objects) - solr_add Array(objects).map{ |a| a.to_solr_doc } + solr_add objects.map{ |a| a.to_solr_doc } + solr_commit if defined?(configuration) and configuration[:auto_commit] end def solr_batch_add_association(ar, association) - solr_batch_add ar.send(association) + result = ar.send(association) + result = [result] unless result.is_a?(Array) + solr_batch_add result end # Sends an add command to Solr -- libgit2 0.21.2