Download as
Browse Code »

Commit c7e9ad9ed4f517fcb415f62b3000b061c6a7031d

Authored by Daniela Feitosa
1 parent 8f571a5e
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

members page: total numbers of members on tabs title 

Also:
- Removed needless hidden_field_tag
- Moved repeated code to partial
Showing 3 changed files with 8 additions and 15 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @c7e9ad9
... ... @@ -67,8 +67,8 @@ class ProfileController < PublicController
67 67 def members
68 68 if is_cache_expired?(profile.members_cache_key(params))
69 69 sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
70   - @profile_admins = profile.admins.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
71   - @profile_members = profile.members.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
  70 + @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
  71 + @profile_members = profile.members.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
72 72 @profile_members_url = url_for(:controller => 'profile', :action => 'members')
73 73 end
74 74 end
... ...
app/views/profile/_profile_members_list.html.erb
  Diff comments   View file @c7e9ad9
... ... @@ -12,3 +12,5 @@
12 12 <%= profile_image_link(u) %>
13 13 <% end %>
14 14 </ul>
  15 +
  16 +<%= pagination_links users, :param_name => 'npage' %>
... ...
app/views/profile/members.html.erb
  Diff comments   View file @c7e9ad9
... ... @@ -15,13 +15,9 @@
15 15 }
16 16 end %>
17 17  
18   - <% members_pagination = content_tag :div, :class => "pagination-profile-members" do
19   - pagination_links @profile_members, :param_name => 'npage'
20   - end %>
21   -
22   - <% tabs << {:title => _("%d Members") % @profile_members.size,
  18 + <% tabs << {:title => _("%d Members") % @profile_members.total_entries,
23 19 :id => "members-tab",
24   - :content => (div_members + members_pagination)
  20 + :content => div_members
25 21 } %>
26 22  
27 23 <% div_admins = content_tag :div, :class => "profile-admins" do
... ... @@ -32,13 +28,9 @@
32 28 }
33 29 end %>
34 30  
35   - <% admins_pagination = content_tag :div, :class => "pagination-profile-admins" do
36   - pagination_links @profile_admins, :param_name => 'npage'
37   - end %>
38   -
39   - <% tabs << {:title => _("%d Administrators") % @profile_admins.size,
  31 + <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries,
40 32 :id => "admins-tab",
41   - :content => (div_admins+admins_pagination)
  33 + :content => div_admins
42 34 } %>
43 35  
44 36 <%= render_tabs(tabs) %>
... ... @@ -58,7 +50,6 @@
58 50 <% end %>
59 51  
60 52 <%= hidden_field_tag "profile_url", @profile_members_url %>
61   -<%= hidden_field_tag "sort", "asc" %>
62 53 </div><!-- end of class="common-profile-list-block" -->
63 54  
64 55 <%= javascript_include_tag "members_page.js" %>
... ...