Download as
Browse Code »

Commit 44dab0ac4d093808a50da41ea5e6e6a59b679bc7

Authored by Weblate
2 parents 232ca6f3 3e4f46a0
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 6 additions and 5 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @44dab0a
@@ -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
  Diff comments   View file @44dab0a
@@ -97,7 +97,7 @@ class Profile < ActiveRecord::Base @@ -97,7 +97,7 @@ class Profile < ActiveRecord::Base
97 end 97 end
98 98
99 def members_by_name 99 def members_by_name
100 - members.order(:name) 100 + members.order('profiles.name')
101 end 101 end
102 102
103 class << self 103 class << self
plugins/people_block/controllers/people_block_plugin_profile_controller.rb
  Diff comments   View file @44dab0a
@@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController &lt; ProfileController @@ -6,12 +6,13 @@ class PeopleBlockPluginProfileController &lt; 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