Download as
Browse Code »

Commit 144212fba27b688d0e3a12ea6092c4f4c7b89da9

Authored by Dmitriy Zaporozhets
1 parent 9a4c8f7e
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Add members paginations to admin/project page 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
app/controllers/admin/projects_controller.rb
  Diff comments   View file @144212f
@@ -17,6 +17,8 @@ class Admin::ProjectsController &lt; Admin::ApplicationController @@ -17,6 +17,8 @@ class Admin::ProjectsController &lt; Admin::ApplicationController
17 end 17 end
18 18
19 def show 19 def show
  20 + @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
  21 + @project_members = @project.users_projects.page(params[:project_members_page]).per(30)
20 end 22 end
21 23
22 def transfer 24 def transfer
app/views/admin/projects/show.html.haml
  Diff comments   View file @144212f
@@ -100,8 +100,10 @@ @@ -100,8 +100,10 @@
100 = link_to admin_group_path(@group), class: 'btn btn-small' do 100 = link_to admin_group_path(@group), class: 'btn btn-small' do
101 %i.icon-edit 101 %i.icon-edit
102 %ul.well-list 102 %ul.well-list
103 - - @group.users_groups.order('group_access DESC').each do |member| 103 + - @group_members.each do |member|
104 = render 'users_groups/users_group', member: member, show_controls: false 104 = render 'users_groups/users_group', member: member, show_controls: false
  105 + .panel-footer
  106 + = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab'
105 107
106 .panel.panel-default 108 .panel.panel-default
107 .panel-heading 109 .panel-heading
@@ -113,7 +115,7 @@ @@ -113,7 +115,7 @@
113 %i.icon-edit 115 %i.icon-edit
114 Manage Access 116 Manage Access
115 %ul.well-list.team_members 117 %ul.well-list.team_members
116 - - @project.users_projects.each do |users_project| 118 + - @project_members.each do |users_project|
117 - user = users_project.user 119 - user = users_project.user
118 %li.users_project 120 %li.users_project
119 .list-item-name 121 .list-item-name
@@ -126,3 +128,5 @@ @@ -126,3 +128,5 @@
126 %span.light= users_project.human_access 128 %span.light= users_project.human_access
127 = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, remote: true, class: "btn btn-small btn-remove" do 129 = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, remote: true, class: "btn btn-small btn-remove" do
128 %i.icon-remove 130 %i.icon-remove
  131 + .panel-footer
  132 + = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'