diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-26 12:48:30 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-26 12:48:30 +0300 |
| commit | 0ebd50ce0015a6a1dcd273cada9d9be8c20a12bb (patch) | |
| tree | 4a92afbdd3e1e473f7d881024b49a36b9d5d3ebb /app/controllers | |
| parent | 645412b57f558d58418aad278c9a3bf421439e1c (diff) | |
| parent | 3ef4f74b1acc9399db320b53dffc592542de0126 (diff) | |
Merge branch 'feature/more-storage-statistics' into 'master'
Add more storage statistics
See merge request !7754
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/groups_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 1e3d194e9f9..61a3a03182a 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -1,17 +1,18 @@ class Admin::GroupsController < Admin::ApplicationController - before_action :group, only: [:edit, :show, :update, :destroy, :project_update, :members_update] + before_action :group, only: [:edit, :update, :destroy, :project_update, :members_update] def index - @groups = Group.all + @groups = Group.with_statistics @groups = @groups.sort(@sort = params[:sort]) @groups = @groups.search(params[:name]) if params[:name].present? @groups = @groups.page(params[:page]) end def show + @group = Group.with_statistics.find_by_full_path(params[:id]) @members = @group.members.order("access_level DESC").page(params[:members_page]) @requesters = AccessRequestsFinder.new(@group).execute(current_user) - @projects = @group.projects.page(params[:projects_page]) + @projects = @group.projects.with_statistics.page(params[:projects_page]) end def new diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 1d963bdf7d5..b09ae423096 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -3,7 +3,7 @@ class Admin::ProjectsController < Admin::ApplicationController before_action :group, only: [:show, :transfer] def index - @projects = Project.all + @projects = Project.with_statistics @projects = @projects.in_namespace(params[:namespace_id]) if params[:namespace_id].present? @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present? @projects = @projects.with_push if params[:with_push].present? diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index efe9c001bcf..01c8fa2739f 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -75,7 +75,7 @@ class GroupsController < Groups::ApplicationController end def projects - @projects = @group.projects.page(params[:page]) + @projects = @group.projects.with_statistics.page(params[:page]) end def update |