FIX pull api bug
This commit is contained in:
		
							parent
							
								
									30138cc1fa
								
							
						
					
					
						commit
						36a3e36edb
					
				| 
						 | 
				
			
			@ -187,12 +187,12 @@ class PullRequestsController < ApplicationController
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
  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, current_user&.gitea_token)
 | 
			
		||||
    # render json: @files_result
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  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, current_user&.gitea_token)
 | 
			
		||||
    # render json: @commits_result
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,7 +22,7 @@ class Gitea::PullRequest::CommitsService < Gitea::ClientService
 | 
			
		|||
 | 
			
		||||
  private
 | 
			
		||||
  def params
 | 
			
		||||
    Hash.new.merge(token: owner)
 | 
			
		||||
    Hash.new.merge(token: token)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def url
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,7 @@
 | 
			
		|||
json.partial! "commons/success"
 | 
			
		||||
json.project_name @project.name
 | 
			
		||||
json.identifier @project.identifier
 | 
			
		||||
json.project_identifier @project.identifier
 | 
			
		||||
json.pr_time time_from_now(@pull_request.updated_at)
 | 
			
		||||
json.commits_count @pull_request.commits_count
 | 
			
		||||
json.files_count @pull_request.files_count
 | 
			
		||||
| 
						 | 
				
			
			@ -10,6 +11,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.create_user @pull_request&.user&.login
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
json.issue do
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue