diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index 266b6c1..f8aa299 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -67,8 +67,8 @@ class ProfileController < PublicController def members if is_cache_expired?(profile.members_cache_key(params)) sort = (params[:sort] == 'desc') ? params[:sort] : 'asc' - @profile_admins = profile.admins.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage]) - @profile_members = profile.members.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage]) + @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage]) + @profile_members = profile.members.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage]) @profile_members_url = url_for(:controller => 'profile', :action => 'members') end end diff --git a/app/views/profile/_profile_members_list.html.erb b/app/views/profile/_profile_members_list.html.erb index 56bf10d..338ca5b 100644 --- a/app/views/profile/_profile_members_list.html.erb +++ b/app/views/profile/_profile_members_list.html.erb @@ -12,3 +12,5 @@ <%= profile_image_link(u) %> <% end %> + +<%= pagination_links users, :param_name => 'npage' %> diff --git a/app/views/profile/members.html.erb b/app/views/profile/members.html.erb index 52dc45f..b8dfd08 100644 --- a/app/views/profile/members.html.erb +++ b/app/views/profile/members.html.erb @@ -15,13 +15,9 @@ } end %> - <% members_pagination = content_tag :div, :class => "pagination-profile-members" do - pagination_links @profile_members, :param_name => 'npage' - end %> - - <% tabs << {:title => _("%d Members") % @profile_members.size, + <% tabs << {:title => _("%d Members") % @profile_members.total_entries, :id => "members-tab", - :content => (div_members + members_pagination) + :content => div_members } %> <% div_admins = content_tag :div, :class => "profile-admins" do @@ -32,13 +28,9 @@ } end %> - <% admins_pagination = content_tag :div, :class => "pagination-profile-admins" do - pagination_links @profile_admins, :param_name => 'npage' - end %> - - <% tabs << {:title => _("%d Administrators") % @profile_admins.size, + <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries, :id => "admins-tab", - :content => (div_admins+admins_pagination) + :content => div_admins } %> <%= render_tabs(tabs) %> @@ -58,7 +50,6 @@ <% end %> <%= hidden_field_tag "profile_url", @profile_members_url %> -<%= hidden_field_tag "sort", "asc" %> <%= javascript_include_tag "members_page.js" %> -- libgit2 0.21.2