Add members paginations to admin/project page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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