Download as
Browse Code »

Commit 6cfb4a8b599c946f04e8a30acc132a74f87bb932

Authored by Antonio Terceiro
1 parent a07fe0f0
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

Fix find_by_contents call 

In Rails 2.3.5, that call was not working because the :include option
was not being considered for some reason. Removed the :include and added
the join explicitly in the query.
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/environment_finder.rb
  Diff comments   View file @6cfb4a8
... ... @@ -53,7 +53,7 @@ class EnvironmentFinder
53 53 # SECURITY no risk of SQL injection, since product_category_ids comes from trusted source
54 54 @environment.send(asset).find_by_contents(query, ferret_options, options.merge({:include => 'product_categorizations', :conditions => 'product_categorizations.category_id = (%s)' % product_category.id }))
55 55 elsif product_category && asset == :enterprises
56   - @environment.send(asset).find_by_contents(query, ferret_options, options.merge(:joins => 'inner join product_categorizations on (product_categorizations.product_id = products.id)', :include => 'products', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
  56 + @environment.send(asset).find_by_contents(query, ferret_options, options.merge(:joins => 'inner join products on products.enterprise_id = profiles.id inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => "product_categorizations.category_id = (#{product_category.id})"))
57 57 else
58 58 @environment.send(asset).find_by_contents(query, ferret_options, options)
59 59 end
... ...