From e316a60433a5fe3ed14d753c04415248be8177c2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 9 Nov 2021 15:41:46 +0800 Subject: [PATCH] fix: pullrequest fork_project_user_name --- app/views/pull_requests/index.json.jbuilder | 2 +- app/views/pull_requests/show.json.jbuilder | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index e13f19351..eb5c949ae 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -21,7 +21,7 @@ json.issues do json.fork_project_id pr&.fork_project_id json.fork_project_identifier pr&.fork_project&.identifier json.fork_project_user pr&.fork_project&.owner.try(:login) - + json.fork_project_user_name pr&.fork_project&.owner.try(:show_real_name) json.id issue.id json.name issue.subject diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index ee6563965..746c42072 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -12,6 +12,7 @@ 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.create_user @pull_request&.user&.login json.mergeable @gitea_pull["mergeable"] json.state @gitea_pull["state"]