diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 2a88e4dcb..7f1797f73 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -60,7 +60,7 @@ class PullRequestsController < ApplicationController target_branch = params[:target_branch] begin # 如果传送了目标项目ID,则PR请求发至目标项目 - if params[:forked_project_id] + if params[:forked_project_id] && params[:source_project] == "forked_project_name" target_project_id = params[:target_project_id] request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id) else diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb index eaf73b137..52e3ed20a 100644 --- a/app/views/pull_requests/_form.html.erb +++ b/app/views/pull_requests/_form.html.erb @@ -15,13 +15,13 @@ <% if @forked_project.nil? %> <%= select_tag :branch, options_for_select(@source_rev), :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetBranch" %> <% else %> - - <% @source_rev.each do |rev| %> - + <% end %> <% end %>