Commit 50400bcfcd8342b415fff8a99e18adfb2914159b
1 parent
da464f01
Exists in
master
and in
29 other branches
people_block: fix listing of members with included relations
Showing
1 changed file
with
3 additions
and
2 deletions
Show diff stats
plugins/people_block/controllers/people_block_plugin_profile_controller.rb
@@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController < ProfileController | @@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController < ProfileController | ||
6 | if is_cache_expired?(profile.members_cache_key(params)) | 6 | if is_cache_expired?(profile.members_cache_key(params)) |
7 | unless params[:role_key].blank? | 7 | unless params[:role_key].blank? |
8 | role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment) | 8 | role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment) |
9 | - @members = profile.members.with_role(role.id).includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) | 9 | + @members = profile.members.with_role(role.id) |
10 | @members_title = role.name | 10 | @members_title = role.name |
11 | else | 11 | else |
12 | - @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) | 12 | + @members = profile.members |
13 | @members_title = 'members' | 13 | @members_title = 'members' |
14 | end | 14 | end |
15 | + @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count) | ||
15 | end | 16 | end |
16 | render "profile/members" | 17 | render "profile/members" |
17 | end | 18 | end |