Browse Source

[FIX]pull_request bug

pull/11/head
viletyy 5 years ago
parent
commit
46a1c8877b
4 changed files with 6 additions and 3 deletions
  1. +2
    -2
      app/controllers/pull_requests_controller.rb
  2. +1
    -1
      app/services/gitea/pull_request/commits_service.rb
  3. +2
    -0
      app/views/pull_requests/show.json.jbuilder
  4. +1
    -0
      public/react/build

+ 2
- 2
app/controllers/pull_requests_controller.rb View File

@@ -191,12 +191,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, @owner.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, @owner.gitea_token)
# render json: @commits_result
end



+ 1
- 1
app/services/gitea/pull_request/commits_service.rb View File

@@ -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


+ 2
- 0
app/views/pull_requests/show.json.jbuilder View File

@@ -1,5 +1,6 @@
json.partial! "commons/success"
json.project_name @project.name
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
@@ -9,6 +10,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


+ 1
- 0
public/react/build

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

Loading…
Cancel
Save