From f0b7618b3d47b6b30bc47311d25a2cd7471225c0 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 11 Aug 2023 17:22:55 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20PR=E4=B8=AD=E5=90=88=E5=B9=B6=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/show.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 71f0641b6..b316043a7 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -25,8 +25,8 @@ end json.pull_request do json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open") - json.fork_project_user @pull_request&.fork_project&.owner.try(:login) - json.fork_project_user_name @pull_request&.fork_project&.owner.try(:show_real_name) + json.fork_project_user @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:login) : @pull_request.project&.owner.try(:login) + json.fork_project_user_name @pull_request.fork_project_id.present? ? @pull_request&.fork_project&.owner.try(:show_real_name) : @pull_request.project&.owner.try(:show_real_name) json.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"]