Download as
Browse Code »

Commit 79a5e5568563d7bff0734df845f8370bf8d4db67

Authored by Rafael Martins
1 parent 9dedafae
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixes for acts_as_solr_reloaded 

* after_save_reindex works from non-indexed classes
Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
  Diff comments   View file @79a5e55
@@ -300,6 +300,7 @@ module ActsAsSolr #:nodoc: @@ -300,6 +300,7 @@ module ActsAsSolr #:nodoc:
300 end 300 end
301 301
302 def after_save_reindex(associations, options = {}) 302 def after_save_reindex(associations, options = {})
  303 + extend ActsAsSolr::CommonMethods
303 Array(associations).each do |association| 304 Array(associations).each do |association|
304 after_save do |ar| 305 after_save do |ar|
305 if options[:with] == :delayed_job 306 if options[:with] == :delayed_job
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb
  Diff comments   View file @79a5e55
@@ -30,11 +30,14 @@ module ActsAsSolr #:nodoc: @@ -30,11 +30,14 @@ module ActsAsSolr #:nodoc:
30 end 30 end
31 31
32 def solr_batch_add(objects) 32 def solr_batch_add(objects)
33 - solr_add Array(objects).map{ |a| a.to_solr_doc } 33 + solr_add objects.map{ |a| a.to_solr_doc }
  34 + solr_commit if defined?(configuration) and configuration[:auto_commit]
34 end 35 end
35 36
36 def solr_batch_add_association(ar, association) 37 def solr_batch_add_association(ar, association)
37 - solr_batch_add ar.send(association) 38 + result = ar.send(association)
  39 + result = [result] unless result.is_a?(Array)
  40 + solr_batch_add result
38 end 41 end
39 42
40 # Sends an add command to Solr 43 # Sends an add command to Solr