From 50400bcfcd8342b415fff8a99e18adfb2914159b Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 3 Dec 2014 08:39:36 -0300 Subject: [PATCH] people_block: fix listing of members with included relations --- plugins/people_block/controllers/people_block_plugin_profile_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/people_block/controllers/people_block_plugin_profile_controller.rb b/plugins/people_block/controllers/people_block_plugin_profile_controller.rb index f8afe3b..f879976 100644 --- a/plugins/people_block/controllers/people_block_plugin_profile_controller.rb +++ b/plugins/people_block/controllers/people_block_plugin_profile_controller.rb @@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController < ProfileController if is_cache_expired?(profile.members_cache_key(params)) unless params[:role_key].blank? role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment) - @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) + @members = profile.members.with_role(role.id) @members_title = role.name else - @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) + @members = profile.members @members_title = 'members' end + @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count) end render "profile/members" end -- libgit2 0.21.2