Commit 4adfd501 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Verify label affiliation before assigning to issue

This also verify if milestone belongs to correct project before creating
a new issue.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439
parent aea97991
......@@ -37,8 +37,9 @@ def create_task_status_note(issuable)
end
def filter_params(issuable_ability_name = :issue)
params[:assignee_id] = "" if params[:assignee_id] == IssuableFinder::NONE
params[:milestone_id] = "" if params[:milestone_id] == IssuableFinder::NONE
filter_assignee
filter_milestone
filter_labels
ability = :"admin_#{issuable_ability_name}"
......@@ -49,6 +50,29 @@ def filter_params(issuable_ability_name = :issue)
end
end
def filter_assignee
if params[:assignee_id] == IssuableFinder::NONE
params[:assignee_id] = ''
end
end
def filter_milestone
return unless params[:milestone_id]
if params[:milestone_id] == IssuableFinder::NONE ||
Milestone.find(params[:milestone_id]).try(:project) != project
params[:milestone_id] = ''
end
end
def filter_labels
return if params[:label_ids].to_a.empty?
params[:label_ids].select! do |label_id|
Label.find(label_id).try(:project) == project
end
end
def update(issuable)
change_state(issuable)
filter_params
......
......@@ -37,6 +37,34 @@
expect(Todo.where(attributes).count).to eq 1
end
context 'label that belongs to different project' do
let(:issue) { Issues::CreateService.new(project, user, opts).execute }
let(:label) { create(:label) }
let(:opts) do
{ title: 'Title',
description: 'Description',
label_ids: [label.id] }
end
it 'does not assign label'do
expect(issue.labels).to_not include label
end
end
context 'milestone that belongs to different project' do
let(:issue) { Issues::CreateService.new(project, user, opts).execute }
let(:milestone) { create(:milestone) }
let(:opts) do
{ title: 'Title',
description: 'Description',
milestone_id: milestone.id }
end
it 'does not assign label' do
expect(issue.milestone).to_not eq milestone
end
end
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment