Commit 9fd17be734041544999f637b4ea29be58779c9b5
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'stable' into hotfixes
Showing
3 changed files
with
6 additions
and
5 deletions
Show diff stats
app/controllers/public/profile_controller.rb
| @@ -65,13 +65,13 @@ class ProfileController < PublicController | @@ -65,13 +65,13 @@ class ProfileController < PublicController | ||
| 65 | 65 | ||
| 66 | def friends | 66 | def friends |
| 67 | if is_cache_expired?(profile.friends_cache_key(params)) | 67 | if is_cache_expired?(profile.friends_cache_key(params)) |
| 68 | - @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage]) | 68 | + @friends = profile.friends.includes(relations_to_include).paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count) |
| 69 | end | 69 | end |
| 70 | end | 70 | end |
| 71 | 71 | ||
| 72 | def members | 72 | def members |
| 73 | if is_cache_expired?(profile.members_cache_key(params)) | 73 | if is_cache_expired?(profile.members_cache_key(params)) |
| 74 | - @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage]) | 74 | + @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count) |
| 75 | end | 75 | end |
| 76 | end | 76 | end |
| 77 | 77 |
app/models/profile.rb
| @@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base | @@ -135,7 +135,7 @@ class Profile < ActiveRecord::Base | ||
| 135 | end | 135 | end |
| 136 | 136 | ||
| 137 | def members_by_name | 137 | def members_by_name |
| 138 | - members.order(:name) | 138 | + members.order('profiles.name') |
| 139 | end | 139 | end |
| 140 | 140 | ||
| 141 | class << self | 141 | class << self |
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).paginate(:per_page => members_per_page, :page => params[:npage]).includes(relations_to_include) | 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.paginate(:per_page => members_per_page, :page => params[:npage]).includes(relations_to_include) | 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 |