From bf2e6269f94da1a9ffd1c9f7d6bfc6a259f4e55a Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Tue, 28 Jun 2022 11:05:12 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BB=93=E5=BA=93=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E8=80=85=E8=A7=92=E8=89=B2=20=E5=8F=AF=E4=BB=A5=E8=B5=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=BB=BA=E5=90=88=E5=B9=B6=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=88=90=E5=8A=9F#61489?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index f45d1f359..1dc5827cc 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -56,7 +56,12 @@ class PullRequestsController < ApplicationController end def create - # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user) + if params[:fork_project_id].present? + fork_project= Project.find_by(id: params[:fork_project_id]) + return normal_status(-1, "您不是源项目开发者，没有权限，请联系源项目管理员.") unless fork_project && fork_project.operator?(current_user) + else + return normal_status(-1, "您不是项目开发者，没有权限，请联系项目管理员.") unless @project.operator?(current_user) + end ActiveRecord::Base.transaction do Issues::CreateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] : params[:body].b}).validate! @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)