#465: Fixed: creation of pull requests

This commit is contained in:
Vokhmin Alexey V 2015-04-14 23:56:16 +03:00
parent e4fdec318f
commit f9ed845fc7
1 changed files with 4 additions and 3 deletions

View File

@ -9,8 +9,8 @@ class Projects::PullRequestsController < Projects::BaseController
to_project = find_destination_project(false) to_project = find_destination_project(false)
authorize to_project, :show? authorize to_project, :show?
@pull = to_project.pull_requests.new @pull = to_project.pull_requests.new
@pull.issue = to_project.issues.new @issue = @pull.issue = to_project.issues.new
set_attrs set_attrs
authorize @pull authorize @pull
@ -34,7 +34,8 @@ class Projects::PullRequestsController < Projects::BaseController
to_project = find_destination_project to_project = find_destination_project
authorize to_project, :show? authorize to_project, :show?
@pull = to_project.pull_requests.new pull_params @pull = to_project.pull_requests.new pull_params
@issue = @pull.issue
@pull.issue.assignee_id = (params[:issue] || {})[:assignee_id] if policy(to_project).write? @pull.issue.assignee_id = (params[:issue] || {})[:assignee_id] if policy(to_project).write?
@pull.issue.user, @pull.issue.project, @pull.from_project = current_user, to_project, @project @pull.issue.user, @pull.issue.project, @pull.from_project = current_user, to_project, @project
@pull.from_project_owner_uname = @pull.from_project.owner.uname @pull.from_project_owner_uname = @pull.from_project.owner.uname