c56326fc3e
When searching we would limit the scope of ancestors to load because the filter would be applied to the ancestors. Instead, we need to load _all_ ancestors for matching projects.
31 lines
1.2 KiB
Ruby
31 lines
1.2 KiB
Ruby
module GroupTree
|
|
# rubocop:disable Gitlab/ModuleWithInstanceVariables
|
|
def render_group_tree(groups)
|
|
@groups = if params[:filter].present?
|
|
# We find the ancestors by ID of the search results here.
|
|
# Otherwise the ancestors would also have filters applied,
|
|
# which would cause them not to be preloaded.
|
|
group_ids = groups.search(params[:filter]).select(:id)
|
|
Gitlab::GroupHierarchy.new(Group.where(id: group_ids))
|
|
.base_and_ancestors
|
|
else
|
|
# Only show root groups if no parent-id is given
|
|
groups.where(parent_id: params[:parent_id])
|
|
end
|
|
|
|
@groups = @groups.with_selects_for_list(archived: params[:archived])
|
|
.sort(@sort = params[:sort])
|
|
.page(params[:page])
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.json do
|
|
serializer = GroupChildSerializer.new(current_user: current_user)
|
|
.with_pagination(request, response)
|
|
serializer.expand_hierarchy if params[:filter].present?
|
|
render json: serializer.represent(@groups)
|
|
end
|
|
end
|
|
# rubocop:enable Gitlab/ModuleWithInstanceVariables
|
|
end
|
|
end
|