Download as
Browse Code »

Commit c4f59660f0f2849aee78c2e7267cd12d434e2470

Authored by Rodrigo Souto
1 parent 5da04adb
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

products-block: fetch sample products without load all products on the memory 

ActionItem3167
Showing 2 changed files with 4 additions and 11 deletions   Show diff stats
app/models/products_block.rb
  Diff comments   View file @c4f5966
@@ -46,17 +46,10 @@ class ProductsBlock < Block @@ -46,17 +46,10 @@ class ProductsBlock < Block
46 46
47 def products(reload = false) 47 def products(reload = false)
48 if product_ids.blank? 48 if product_ids.blank?
49 - products_list = owner.products(reload)  
50 - result = []  
51 - [4, products_list.size].min.times do  
52 - p = products_list.rand  
53 - result << p  
54 - products_list -= [p]  
55 - end  
56 - result 49 + owner.products.order('RANDOM()').limit([4,owner.products.count].min)
57 else 50 else
58 - product_ids.map {|item| owner.products.find(item) }  
59 - end 51 + owner.products.where(:id => product_ids)
  52 + end.compact
60 end 53 end
61 54
62 end 55 end
test/unit/products_block_test.rb
  Diff comments   View file @c4f5966
@@ -86,7 +86,7 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase @@ -86,7 +86,7 @@ class ProductsBlockTest &lt; ActiveSupport::TestCase
86 block.stubs(:owner).returns(enterprise) 86 block.stubs(:owner).returns(enterprise)
87 87
88 block.product_ids = [p1, p3, p5].map(&:id) 88 block.product_ids = [p1, p3, p5].map(&:id)
89 - assert_equal [p1, p3, p5], block.products 89 + assert_equivalent [p1, p3, p5], block.products
90 end 90 end
91 91
92 should 'save product_ids' do 92 should 'save product_ids' do