Browse Source

更改:compare接口

pull/347/head
yystopf 2 years ago
parent
commit
026d58c347
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      app/services/api/v1/projects/compare_service.rb
  2. +5
    -1
      app/views/api/v1/projects/compare.json.jbuilder

+ 1
- 1
app/services/api/v1/projects/compare_service.rb View File

@@ -29,6 +29,6 @@ class Api::V1::Projects::CompareService < ApplicationService
end

def load_gitea_data
@gitea_data = $gitea_client.get_repos_compare_by_owner_repo_from_to(owner, repo, from, to, {query: request_params}) rescue nil
@gitea_data = $gitea_hat_client.get_repos_compare_by_owner_repo_baseref_headref(owner, repo, to, from, {query: request_params}) rescue nil
end
end

+ 5
- 1
app/views/api/v1/projects/compare.json.jbuilder View File

@@ -14,5 +14,9 @@ json.commits @result_object['Commits'] do |commit|
json.parent_shas commit['Sha']['ParentShas']
end
json.diff do
json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object['Diff']
if @result_object['Diff'].present?
json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object['Diff']
else
json.nil!
end
end

Loading…
Cancel
Save