diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-17 16:27:38 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-20 10:20:02 +0000 |
commit | 17fe8174a27e8fb5f5f4bbfce0be454bea943bf3 (patch) | |
tree | 20024420503192766a97d3428f130effafd26340 | |
parent | dc18038a37347e77f037bd3712296f91daaef859 (diff) | |
download | gitlab-ce-17fe8174a27e8fb5f5f4bbfce0be454bea943bf3.tar.gz |
Merge branch 'bvl-fix-count-with-selects' into 'master'
Remove the selects when counting the last page
Closes #40266
See merge request gitlab-org/gitlab-ce!15456
(cherry picked from commit c406824d319e5b1a073af7cf55c3f24bfa66e2a4)
5a335c4d Remove the selects when counting the last page
-rw-r--r-- | changelogs/unreleased/bvl-fix-count-with-selects.yml | 6 | ||||
-rw-r--r-- | lib/gitlab/multi_collection_paginator.rb | 4 | ||||
-rw-r--r-- | spec/controllers/groups/children_controller_spec.rb | 11 |
3 files changed, 20 insertions, 1 deletions
diff --git a/changelogs/unreleased/bvl-fix-count-with-selects.yml b/changelogs/unreleased/bvl-fix-count-with-selects.yml new file mode 100644 index 00000000000..46a882de524 --- /dev/null +++ b/changelogs/unreleased/bvl-fix-count-with-selects.yml @@ -0,0 +1,6 @@ +--- +title: Fix crash when navigating to second page of the group dashbaord when there + are projects and groups on the first page +merge_request: 15456 +author: +type: fixed diff --git a/lib/gitlab/multi_collection_paginator.rb b/lib/gitlab/multi_collection_paginator.rb index eb3c9002710..c22d0a84860 100644 --- a/lib/gitlab/multi_collection_paginator.rb +++ b/lib/gitlab/multi_collection_paginator.rb @@ -55,7 +55,9 @@ module Gitlab def first_collection_last_page_size return @first_collection_last_page_size if defined?(@first_collection_last_page_size) - @first_collection_last_page_size = paginated_first_collection(first_collection_page_count).count + @first_collection_last_page_size = paginated_first_collection(first_collection_page_count) + .except(:select) + .size end end end diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb index 4262d474e59..cb1b460fc0e 100644 --- a/spec/controllers/groups/children_controller_spec.rb +++ b/spec/controllers/groups/children_controller_spec.rb @@ -280,6 +280,17 @@ describe Groups::ChildrenController do expect(assigns(:children)).to contain_exactly(other_subgroup, *next_page_projects.take(per_page - 1)) end + + context 'with a mixed first page' do + let!(:first_page_subgroups) { [create(:group, :public, parent: group)] } + let!(:first_page_projects) { create_list(:project, per_page, :public, namespace: group) } + + it 'correctly calculates the counts' do + get :index, group_id: group.to_param, sort: 'id_asc', page: 2, format: :json + + expect(response).to have_gitlab_http_status(200) + end + end end end end |