Download as
Browse Code »

Commit 50400bcfcd8342b415fff8a99e18adfb2914159b

Authored by Victor Costa
1 parent da464f01
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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
  Diff comments   View file @50400bc
... ... @@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController < ProfileController
6 6 if is_cache_expired?(profile.members_cache_key(params))
7 7 unless params[:role_key].blank?
8 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 10 @members_title = role.name
11 11 else
12   - @members = profile.members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage])
  12 + @members = profile.members
13 13 @members_title = 'members'
14 14 end
  15 + @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
15 16 end
16 17 render "profile/members"
17 18 end
... ...