This commit is contained in:
parent
de1e931c2f
commit
36dbf76d80
|
@ -15,10 +15,11 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
|
|||
|
||||
def call
|
||||
load_gitea_data
|
||||
|
||||
gitea_data["default_branch"] = gitea_repo_data["default_branch"]
|
||||
load_default_branch
|
||||
|
||||
gitea_data
|
||||
@gitea_data[:default_branch] = @gitea_repo_data["default_branch"]
|
||||
|
||||
@gitea_data
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -39,7 +40,7 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
|
|||
end
|
||||
|
||||
def load_default_branch
|
||||
@gitea_repo_data = $gitea_client.get_repos_by_owner_repo('yystopf', 'pig') rescue nil
|
||||
@gitea_repo_data = $gitea_client.get_repos_by_owner_repo(owner, repo) rescue nil
|
||||
raise Error, '获取仓库信息失败!' unless @gitea_data.is_a?(Hash)
|
||||
end
|
||||
end
|
|
@ -20,7 +20,7 @@ json.user_can_merge branch['user_can_merge']
|
|||
json.commit_id branch['commit']['id']
|
||||
json.commit_time_from_now time_from_now(branch['commit']['timestamp'].to_time)
|
||||
json.commit_time branch['commit']['timestamp']
|
||||
json.default_branch branch['default_branch']
|
||||
json.default_branch default_branch || nil
|
||||
json.http_url render_http_url(@project)
|
||||
json.zip_url render_zip_url(@owner, @project.repository, branch['name'])
|
||||
json.tar_url render_tar_url(@owner, @project.repository, branch['name'])
|
|
@ -1 +1 @@
|
|||
json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: @result_object
|
||||
json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: @result_object, default_branch: @result_object[:default_branch]
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
json.total_count @result_object[:total_data].to_i
|
||||
json.branches @result_object[:data].each do |branch|
|
||||
json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch
|
||||
json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch, default_branch: @result_object[:default_branch]
|
||||
|
||||
end
|
Loading…
Reference in New Issue