Download as
Browse Code »

Commit 81fab8d7f66f12d464a80bf71991d01887057e31

Authored by AntonioTerceiro
1 parent 7aaeb63f
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

ActionItem514: avoiding uneeded queries 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2220 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @81fab8d
@@ -91,7 +91,7 @@ class SearchController < ApplicationController @@ -91,7 +91,7 @@ class SearchController < ApplicationController
91 # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop 91 # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop
92 92
93 cats = ProductCategory.menu_categories(@product_category, environment) 93 cats = ProductCategory.menu_categories(@product_category, environment)
94 - cats += cats.map(&:children).flatten 94 + cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten
95 product_categories_ids = cats.map(&:id) 95 product_categories_ids = cats.map(&:id)
96 96
97 object_ids = nil 97 object_ids = nil
@@ -105,10 +105,14 @@ class SearchController < ApplicationController @@ -105,10 +105,14 @@ class SearchController < ApplicationController
105 hits = counts[cat.id] 105 hits = counts[cat.id]
106 childs = [] 106 childs = []
107 if hits 107 if hits
108 - childs = cat.children.map do |child|  
109 - child_hits = counts[child.id]  
110 - [child, child_hits]  
111 - end.select{|child, child_hits| child_hits } 108 + if cat.children_count > 0
  109 + childs = cat.children.map do |child|
  110 + child_hits = counts[child.id]
  111 + [child, child_hits]
  112 + end.select{|child, child_hits| child_hits }
  113 + else
  114 + childs = []
  115 + end
112 end 116 end
113 [cat, hits, childs] 117 [cat, hits, childs]
114 end.select{|cat, hits| hits } 118 end.select{|cat, hits| hits }