From 595c4145d51fcd13f14111a2df97d0ebed14128f Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 3 Dec 2014 08:12:32 -0300 Subject: [PATCH] Revert "Fix problem when listing profiles with included relations" --- app/controllers/public/profile_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index b265fbb..c5381f7 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -55,7 +55,7 @@ class ProfileController < PublicController def communities if is_cache_expired?(profile.communities_cache_key(params)) - @communities = profile.communities.paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count).includes(relations_to_include) + @communities = profile.communities.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.communities.count) end end @@ -65,13 +65,13 @@ class ProfileController < PublicController def friends if is_cache_expired?(profile.friends_cache_key(params)) - @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage]).includes(relations_to_include) + @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage]) end end def members if is_cache_expired?(profile.members_cache_key(params)) - @members = profile.members_by_name.paginate(:per_page => members_per_page, :page => params[:npage]).includes(relations_to_include) + @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) end end -- libgit2 0.21.2