ADD mergeable column for get pull api
This commit is contained in:
parent
27d9d806ce
commit
8a47761afb
|
@ -136,7 +136,8 @@ class PullRequestsController < ApplicationController
|
||||||
def show
|
def show
|
||||||
@issue_user = @issue.user
|
@issue_user = @issue.user
|
||||||
@issue_assign_to = @issue.get_assign_user
|
@issue_assign_to = @issue.get_assign_user
|
||||||
|
@gitea_pull = Gitea::PullRequest::GetService.call(@owner.login,
|
||||||
|
@repository.identifier, @pull_request.gpid, current_user&.gitea_token)
|
||||||
end
|
end
|
||||||
|
|
||||||
def pr_merge
|
def pr_merge
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
# Get a pull request
|
# Get a pull request
|
||||||
class Gitea::PullRequest::GetService < Gitea::ClientService
|
class Gitea::PullRequest::GetService < Gitea::ClientService
|
||||||
attr_reader :user, :repo, :pull_request_id
|
attr_reader :owner, :repo, :number, :token
|
||||||
|
|
||||||
# user: 用户
|
#eq:
|
||||||
# repo: 仓库名称/标识
|
# Gitea::PullRequest::GetService.call(user.login, repository.identifier, pull.gpid, user.gitea_token)
|
||||||
# pull_request_id: pull request主键id
|
def initialize(owner, repo, number, token=nil)
|
||||||
def initialize(user, repo, pull_request_id)
|
@owner = owner
|
||||||
super({token: user.gitea_token})
|
|
||||||
@user = user
|
|
||||||
@repo = repo
|
@repo = repo
|
||||||
@pull_request_id = pull_request_id
|
@number = number
|
||||||
|
@token = token
|
||||||
end
|
end
|
||||||
|
|
||||||
def call
|
def call
|
||||||
|
@ -19,11 +18,11 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
|
||||||
|
|
||||||
private
|
private
|
||||||
def params
|
def params
|
||||||
Hash.new.merge(token: user.gitea_token)
|
Hash.new.merge(token: token)
|
||||||
end
|
end
|
||||||
|
|
||||||
def url
|
def url
|
||||||
"/repos/#{user.login}/#{repo}/pulls/#{pull_request_id}".freeze
|
"/repos/#{owner}/#{repo}/pulls/#{number}".freeze
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_result(response)
|
def render_result(response)
|
||||||
|
@ -31,7 +30,7 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
|
||||||
when 200
|
when 200
|
||||||
JSON.parse(response.body)
|
JSON.parse(response.body)
|
||||||
else
|
else
|
||||||
nil
|
{}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,6 +12,8 @@ json.pull_request do
|
||||||
json.pull_request_staus @pull_request.status == 1 ? "merged" : (@pull_request.status == 2 ? "closed" : "open")
|
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 @pull_request&.fork_project&.owner.try(:login)
|
||||||
json.create_user @pull_request&.user&.login
|
json.create_user @pull_request&.user&.login
|
||||||
|
json.mergeable @gitea_pull["mergeable"]
|
||||||
|
json.state @gitea_pull["state"]
|
||||||
end
|
end
|
||||||
|
|
||||||
json.issue do
|
json.issue do
|
||||||
|
|
Loading…
Reference in New Issue