Rails5 fix passing Group objects array into for_projects_and_groups milestone scope

This commit is contained in:
Jasper Maes 2018-06-14 18:39:21 +02:00
parent 4791f77100
commit 3778a136e1
3 changed files with 9 additions and 3 deletions

View file

@ -123,9 +123,9 @@ class Projects::MilestonesController < Projects::ApplicationController
def search_params
if request.format.json? && @project.group && can?(current_user, :read_group, @project.group)
groups = @project.group.self_and_ancestors
groups = @project.group.self_and_ancestors_ids
end
params.permit(:state).merge(project_ids: @project.id, group_ids: groups&.select(:id))
params.permit(:state).merge(project_ids: @project.id, group_ids: groups)
end
end

View file

@ -0,0 +1,6 @@
---
title: Rails5 fix passing Group objects array into for_projects_and_groups milestone
scope
merge_request: 19863
author: Jasper Maes
type: fixed

View file

@ -65,7 +65,7 @@ module Banzai
# We don't support IID lookups for group milestones, because IIDs can
# clash between group and project milestones.
if project.group && !params[:iid]
finder_params[:group_ids] = project.group.self_and_ancestors.select(:id)
finder_params[:group_ids] = project.group.self_and_ancestors_ids
end
MilestonesFinder.new(finder_params).find_by(params)