Skip to content

Commit cb55b9c

Browse files
Merging pull request #204 from fga-gpp-mds/issue_pullrequest_on_kanban
2 parents b420b47 + 09ee2e1 commit cb55b9c

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

app/controllers/issues_controller.rb

+8-5
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,15 @@ def convert_form_params(issue)
123123
@form_params = { issues_infos: [] }
124124
if issue.kind_of?(Array)
125125
@issues.each do |issue|
126-
assignees = assingnee_counter(issue)
127-
@form_params[:issues_infos].push(name: issue.title, number: issue.number, body: issue.body, issue_id: issue.id, assignees: assignees)
126+
make_form_params(issue)
128127
end
129128
else
130-
assignees = assingnee_counter(issue)
131-
@form_params[:issues_infos].push(name: issue.title, number: issue.number, body: issue.body, issue_id: issue.id, assignees: assignees)
129+
make_form_params(issue)
132130
end
133131
@form_params
134132
end
135133

136-
def assingnee_counter(issue)
134+
def assignee_counter(issue)
137135
assignees = []
138136
if issue.assignees.count > 0
139137
issue.assignees.each do |assignee|
@@ -143,6 +141,11 @@ def assingnee_counter(issue)
143141
assignees
144142
end
145143

144+
def make_form_params(issue)
145+
assignees = assignee_counter(issue)
146+
@form_params[:issues_infos].push(name: issue.title, number: issue.number, body: issue.body, issue_id: issue.id, assignees: assignees) unless issue.pull_request
147+
end
148+
146149
def issue_params
147150
params.require(:issue).permit(:name, :body, :number)
148151
end

0 commit comments

Comments
 (0)