diff --git a/app/controllers/api/v1/projects/pulls/pulls_controller.rb b/app/controllers/api/v1/projects/pulls/pulls_controller.rb index 254ad1741..b56f00777 100644 --- a/app/controllers/api/v1/projects/pulls/pulls_controller.rb +++ b/app/controllers/api/v1/projects/pulls/pulls_controller.rb @@ -17,7 +17,7 @@ class Api::V1::Projects::Pulls::PullsController < Api::V1::BaseController if params[:filepath].present? @result_object = $gitea_hat_client.get_repos_pulls_files_by_owner_repo_index_filepath(@project&.owner.login, @project&.identifier, @pull_request.gitea_number, params[:filepath], {query: {token: current_user&.gitea_token}}) else - @result_object = $gitea_client.get_repos_pulls_files_by_owner_repo_index(@project&.owner.login, @project&.identifier, @pull_request.gitea_number, {query: {token: current_user&.gitea_token, page: page, limit: limit}}) + @result_object = $gitea_hat_client.get_repos_pulls_files_by_owner_repo_index(@project&.owner.login, @project&.identifier, @pull_request.gitea_number, {query: {isNew: "true",token: current_user&.gitea_token, page: page, limit: limit}}) end end diff --git a/app/views/api/v1/projects/_simple_gitea_file.jbuilder b/app/views/api/v1/projects/_simple_gitea_file.jbuilder index 44a9d7b2b..7092a84e2 100644 --- a/app/views/api/v1/projects/_simple_gitea_file.jbuilder +++ b/app/views/api/v1/projects/_simple_gitea_file.jbuilder @@ -1,5 +1,14 @@ json.filename file["filename"] -json.status file["status"] +json.old_name file["old_name"] +json.index file["index"] +json.type file["type"] +json.is_bin file["is_bin"] +json.is_created file["is_created"] +json.is_deleted file["is_deleted"] +json.is_lfs_file file["is_lfs_file"] +json.is_renamed file["is_renamed"] +json.is_submodule file["is_submodule"] json.additions file["additions"] json.deletions file["deletions"] json.changes file["changes"] +json.sha file["sha"] \ No newline at end of file diff --git a/app/views/api/v1/projects/commits/files.json.jbuilder b/app/views/api/v1/projects/commits/files.json.jbuilder index ce83579d5..4eaa4f5aa 100644 --- a/app/views/api/v1/projects/commits/files.json.jbuilder +++ b/app/views/api/v1/projects/commits/files.json.jbuilder @@ -1,8 +1,10 @@ if params[:filepath].present? json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object else - json.file_numbers @result_object[:total_data].to_i - json.files @result_object[:data] do |file| + json.file_numbers @result_object[:total_data] + json.total_addition @result_object[:data]["total_addition"] + json.total_deletion @result_object[:data]["total_deletion"] + json.files @result_object[:data]["files"] do |file| json.partial! "api/v1/projects/simple_gitea_file", file: file end end \ No newline at end of file diff --git a/app/views/api/v1/projects/compare/files.json.jbuilder b/app/views/api/v1/projects/compare/files.json.jbuilder index 54fc61218..0c05d8b8f 100644 --- a/app/views/api/v1/projects/compare/files.json.jbuilder +++ b/app/views/api/v1/projects/compare/files.json.jbuilder @@ -13,7 +13,9 @@ if params[:filepath].present? end else json.file_numbers @compare_result[:total_data].to_i - json.files @compare_result[:data] do |file| + json.total_addition @compare_result[:data]["total_addition"] + json.total_deletion @compare_result[:data]["total_deletion"] + json.files @compare_result[:data]["files"] do |file| json.partial! "api/v1/projects/simple_gitea_file", file: file end end diff --git a/app/views/api/v1/projects/pulls/pulls/files.json.jbuilder b/app/views/api/v1/projects/pulls/pulls/files.json.jbuilder index 2698e30f0..4eaa4f5aa 100644 --- a/app/views/api/v1/projects/pulls/pulls/files.json.jbuilder +++ b/app/views/api/v1/projects/pulls/pulls/files.json.jbuilder @@ -2,7 +2,9 @@ if params[:filepath].present? json.partial! "api/v1/projects/simple_gitea_diff_detail", diff: @result_object else json.file_numbers @result_object[:total_data] - json.files @result_object[:data] do |file| + json.total_addition @result_object[:data]["total_addition"] + json.total_deletion @result_object[:data]["total_deletion"] + json.files @result_object[:data]["files"] do |file| json.partial! "api/v1/projects/simple_gitea_file", file: file end end \ No newline at end of file