FIX 处理合并请求详情接口,当前用户是否能合并的操作权限

This commit is contained in:
jasder duan 2024-10-24 15:12:09 +08:00
parent 1547cb7ad5
commit 3d933634e3
2 changed files with 10 additions and 0 deletions

View File

@ -175,6 +175,12 @@ class PullRequestsController < ApplicationController
@gitea_pull = Gitea::PullRequest::GetService.call(@owner.login,
@repository.identifier, @pull_request.gitea_number, @owner&.gitea_token)
# @last_review = @pull_request.reviews.take
begin
@base_branch = Gitea::Repository::Branches::GetService.call(@project.owner, @project.identifier, @pull_request.base, current_user&.gitea_token)
rescue StandardError => e
Rails.logger.info "pull_request get base branch error: #{e.message}"
@base_branch = {}
end
end
def pr_merge

View File

@ -7,6 +7,10 @@ json.commits_count @gitea_pull["commit_num"]
json.files_count @gitea_pull["changed_files"]
json.comments_count @issue.journals.parent_journals.size
json.comments_total_count @issue.get_journals_size
json.user_can_push @base_branch["user_can_push"] | false # base分支是否可以push
json.user_can_merge @base_branch["user_can_merge"] | false # base分支是否可以合并PR
json.assign_user do
json.partial! 'users/user_simple', user: @issue_assign_to
end