diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 14:46:57 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 14:46:57 +0000 |
commit | ce3cf6985cda53d618cdb5b7a86b625a72b4f8d6 (patch) | |
tree | 7949b59040343dbbec1264f0df9e834ee2ebef22 | |
parent | cbee5f00fdc045eae3be2d7598e251ef4545df2f (diff) | |
parent | 684536321c9c847a8a39d0adc95e0c17be355c72 (diff) | |
download | gitlab-ce-ce3cf6985cda53d618cdb5b7a86b625a72b4f8d6.tar.gz |
Merge branch 'fix-admin-group-page' into 'master'
Fix: Admin group show page does not work
Closes #26147
See merge request !8339
-rw-r--r-- | app/controllers/admin/groups_controller.rb | 2 | ||||
-rw-r--r-- | spec/features/admin/admin_groups_spec.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 61a3a03182a..add1c819adf 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -9,7 +9,7 @@ class Admin::GroupsController < Admin::ApplicationController end def show - @group = Group.with_statistics.find_by_full_path(params[:id]) + @group = Group.with_statistics.joins(:route).group('routes.path').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.with_statistics.page(params[:projects_page]) diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb index 0aa01fc499a..9c19db6b420 100644 --- a/spec/features/admin/admin_groups_spec.rb +++ b/spec/features/admin/admin_groups_spec.rb @@ -17,6 +17,16 @@ feature 'Admin Groups', feature: true do end end + describe 'show a group' do + scenario 'shows the group' do + group = create(:group, :private) + + visit admin_group_path(group) + + expect(page).to have_content("Group: #{group.name}") + end + end + describe 'group edit' do scenario 'shows the visibility level radio populated with the group visibility_level value' do group = create(:group, :private) |