yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]pull_request bug

This commit is contained in:
viletyy 2021-01-13 11:26:21 +08:00
parent 2f140d13f0
commit 46a1c8877b
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@ -191,12 +191,12 @@ class PullRequestsController < ApplicationController
def files def files
@files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid) @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid, @owner.gitea_token)
# render json: @files_result # render json: @files_result
end end
def commits def commits
@commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid) @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid, @owner.gitea_token)
# render json: @commits_result # render json: @commits_result
end end

2
app/services/gitea/pull_request/commits_service.rb
View File

@ -22,7 +22,7 @@ class Gitea::PullRequest::CommitsService < Gitea::ClientService
private private
def params def params
Hash.new.merge(token: owner) Hash.new.merge(token: token)
end end
def url def url

2
app/views/pull_requests/show.json.jbuilder
View File

@ -1,5 +1,6 @@
json.partial! "commons/success" json.partial! "commons/success"
json.project_name @project.name json.project_name @project.name
json.project_identifier @project.identifier
json.pr_time time_from_now(@pull_request.updated_at) json.pr_time time_from_now(@pull_request.updated_at)
json.commits_count @pull_request.commits_count json.commits_count @pull_request.commits_count
json.files_count @pull_request.files_count json.files_count @pull_request.files_count
@ -9,6 +10,7 @@ json.pull_request do
json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original 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.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
end end
json.issue do json.issue do

1
public/react/build Submodule

@ -0,0 +1 @@
Subproject commit 6348a15cdb954862dc1b7b5f045a432bcfde7dc4