From be0f68cede5ef6aeeb6186f863f349f7f330ffd3 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 25 Nov 2021 11:19:50 +0800
Subject: [PATCH] fix

---
 app/controllers/pull_requests_controller.rb  |  2 +-
 app/services/pull_requests/create_service.rb | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 675c6523b..01b79e071 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -197,7 +197,7 @@ class PullRequestsController < ApplicationController
   def check_can_merge
     target_head = params[:head]  #源分支
     target_base = params[:base]  #目标分支
-    is_original = params[:is_original]
+    is_original = params[:is_original] || false
     if target_head.blank? || target_base.blank?
       normal_status(-2, "请选择分支")
     elsif target_head === target_base && !is_original
diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb
index 72bfa7a2d..67766be64 100644
--- a/app/services/pull_requests/create_service.rb
+++ b/app/services/pull_requests/create_service.rb
@@ -94,7 +94,7 @@ class PullRequests::CreateService < ApplicationService
       user: @current_user,
       issue: pull_issue,
       fork_project_id: @params[:fork_project_id],
-      is_original: @params[:is_original],
+      is_original: is_original,
       files_count: @params[:files_count] || 0,
       commits_count: @params[:commits_count] || 0
     })
@@ -145,11 +145,13 @@ class PullRequests::CreateService < ApplicationService
     raise "title参数不能为空" if @params[:title].blank?
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
-    puts @params[:head] 
-    puts @params[:base]
-    raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !@params[:is_original]
-    raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: @params[:is_original], fork_project_id: @params[:fork_project_id]).present?
+    raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
+    raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?
     raise @pull_request.errors.full_messages.join(", ") unless pull_request.valid?
   end
+
+  def is_original
+    @params[:is_original] || false
+  end
 end