Commit fc72f8e3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'performance-improvements' into 'master'

Performance improvements

Fixes #1135
parents 34cf3c49 5a064b02
...@@ -253,6 +253,12 @@ ul.breadcrumb { ...@@ -253,6 +253,12 @@ ul.breadcrumb {
} }
} }
.panel-footer {
.pagination {
margin: 0;
}
}
&.panel-small { &.panel-small {
.panel-heading { .panel-heading {
padding: 6px 15px; padding: 6px 15px;
......
...@@ -8,6 +8,8 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -8,6 +8,8 @@ class Admin::GroupsController < Admin::ApplicationController
end end
def show def show
@members = @group.members.order("group_access DESC").page(params[:members_page]).per(30)
@projects = @group.projects.page(params[:projects_page]).per(30)
end end
def new def new
......
...@@ -17,6 +17,11 @@ class Admin::ProjectsController < Admin::ApplicationController ...@@ -17,6 +17,11 @@ class Admin::ProjectsController < Admin::ApplicationController
end end
def show def show
if @group
@group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
end
@project_members = @project.users_projects.page(params[:project_members_page]).per(30)
end end
def transfer def transfer
......
...@@ -31,11 +31,12 @@ ...@@ -31,11 +31,12 @@
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
%h3.panel-title
Projects Projects
%small %span.badge
(#{@group.projects.count}) #{@group.projects.count}
%ul.well-list %ul.well-list
- @group.projects.sort_by(&:name).each do |project| - @projects.each do |project|
%li %li
%strong %strong
= link_to project.name_with_namespace, [:admin, project] = link_to project.name_with_namespace, [:admin, project]
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
= repository_size(project) = repository_size(project)
%span.pull-right.light %span.pull-right.light
%span.monospace= project.path_with_namespace + ".git" %span.monospace= project.path_with_namespace + ".git"
.panel-footer
= paginate @projects, param_name: 'projects_page', theme: 'gitlab'
.col-md-6 .col-md-6
.panel.panel-default .panel.panel-default
...@@ -62,12 +65,12 @@ ...@@ -62,12 +65,12 @@
= submit_tag 'Add users into group', class: "btn btn-create" = submit_tag 'Add users into group', class: "btn btn-create"
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
%strong #{@group.name} %h3.panel-title
Group Members Members
%small %span.badge
(#{@group.users_groups.count}) #{@group.users_groups.count}
%ul.well-list.group-users-list %ul.well-list.group-users-list
- @group.users_groups.order('group_access DESC').each do |member| - @members.each do |member|
- user = member.user - user = member.user
%li{class: dom_class(user)} %li{class: dom_class(user)}
.list-item-name .list-item-name
...@@ -77,3 +80,5 @@ ...@@ -77,3 +80,5 @@
= member.human_access = member.human_access
= link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-minus.icon-white %i.icon-minus.icon-white
.panel-footer
= paginate @members, param_name: 'members_page', theme: 'gitlab'
...@@ -100,8 +100,10 @@ ...@@ -100,8 +100,10 @@
= link_to admin_group_path(@group), class: 'btn btn-small' do = link_to admin_group_path(@group), class: 'btn btn-small' do
%i.icon-edit %i.icon-edit
%ul.well-list %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 = 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.panel-default
.panel-heading .panel-heading
...@@ -113,7 +115,7 @@ ...@@ -113,7 +115,7 @@
%i.icon-edit %i.icon-edit
Manage Access Manage Access
%ul.well-list.team_members %ul.well-list.team_members
- @project.users_projects.each do |users_project| - @project_members.each do |users_project|
- user = users_project.user - user = users_project.user
%li.users_project %li.users_project
.list-item-name .list-item-name
...@@ -126,3 +128,5 @@ ...@@ -126,3 +128,5 @@
%span.light= users_project.human_access %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 = 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 %i.icon-remove
.panel-footer
= paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment