Download as
Browse Code »

Commit d39451e482d50afaed0105c38b049003aef6563c

Authored by Larissa Reis
1 parent 7ebda177
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

solr: only uses environment_id in filter query on indexed tables 

  This avoids solr throwing an error when it tries to filter by
  unindexed column.
Showing 1 changed file with 5 additions and 4 deletions   Show diff stats
plugins/solr/lib/solr_plugin/search_helper.rb
  Diff comments   View file @d39451e
... ... @@ -42,12 +42,14 @@ module SolrPlugin::SearchHelper
42 42 asset_class(asset).table_name
43 43 end
44 44  
45   - def filters(asset)
  45 + def filters(asset, environment)
46 46 case asset
47 47 when :products
48 48 ['solr_plugin_public:true', 'enabled:true']
49   - when :events
  49 + when :catalog, :events, :categories, :product_categories
50 50 []
  51 + when :profiles, :people, :organizations, :communities, :enterprises
  52 + ['solr_plugin_public:true', 'environment_id:%s' % environment.id]
51 53 else
52 54 ['solr_plugin_public:true']
53 55 end
... ... @@ -88,8 +90,7 @@ module SolrPlugin::SearchHelper
88 90 solr_options[:all_facets] = true
89 91 end
90 92 solr_options[:filter_queries] ||= []
91   - solr_options[:filter_queries] += filters(asset)
92   - solr_options[:filter_queries] << "environment_id:#{environment.id}"
  93 + solr_options[:filter_queries] += filters(asset, environment)
93 94 solr_options[:filter_queries] << asset_class.facet_category_query.call(category) if category
94 95  
95 96 solr_options[:boost_functions] ||= []
... ...