Download as
Browse Code »

Commit 5e223b9201c38dc4048db84652da3870fbfe98de

Authored by Victor Costa
1 parent f7be1cc6
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: count over queries with includes does not work

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/profile_list_block.rb
  Diff comments   View file @5e223b9
... ... @@ -19,10 +19,10 @@ class ProfileListBlock < Block
19 19 visible_profiles = profiles.visible.includes([:image,:domains,:preferred_domain,:environment])
20 20 if !prioritize_profiles_with_image
21 21 result = visible_profiles.all(:limit => limit, :order => 'updated_at DESC').sort_by{ rand }
22   - elsif visible_profiles.with_image.count >= limit
  22 + elsif profiles.visible.with_image.count >= limit
23 23 result = visible_profiles.with_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
24 24 else
25   - result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'updated_at DESC').sort_by{ rand }
  25 + result = visible_profiles.with_image.sort_by{ rand } + visible_profiles.without_image.all(:limit => limit * 5, :order => 'profiles.updated_at DESC').sort_by{ rand }
26 26 end
27 27 result.slice(0..limit-1)
28 28 end
... ...