Download as
Browse Code »

Commit 34560e6e8dbe1cd5b7f90a096b7475bc06031f8b

Authored by MoisesMachado
1 parent 8ae01dc6
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

ActionItem501: fixed the load of the rigth categories for little icons 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2245 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/environment_finder.rb
  Diff comments   View file @34560e6
@@ -29,7 +29,7 @@ class EnvironmentFinder @@ -29,7 +29,7 @@ class EnvironmentFinder
29 if product_category && asset == :products 29 if product_category && asset == :products
30 @environment.send(asset).send(finder_method, :all, options.merge(:include => 'product_categorizations', :conditions => ['product_categorizations.category_id = (?)', product_category.id])) 30 @environment.send(asset).send(finder_method, :all, options.merge(:include => 'product_categorizations', :conditions => ['product_categorizations.category_id = (?)', product_category.id]))
31 elsif product_category && asset == :enterprises 31 elsif product_category && asset == :enterprises
32 - @environment.send(asset).send(finder_method, :all, options.merge(:order => 'profiles.name', :include => 'products', :joins => 'inner join product_categorizations on (product_categorizations.product_id = products.id)', :conditions => ['product_categorizations.category_id = (?)', product_category.id])) 32 + @environment.send(asset).send(finder_method, :all, options.merge( :order => 'profiles.name', :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]))
33 else 33 else
34 if (asset == :events) && date_range 34 if (asset == :events) && date_range
35 @environment.send(asset).send(finder_method, :all, options.merge(:conditions => { :start_date => date_range})) 35 @environment.send(asset).send(finder_method, :all, options.merge(:conditions => { :start_date => date_range}))