floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: branches use branch name api

This commit is contained in:
yystopf 2022-01-07 15:41:50 +08:00
parent 7a1e6cfbad
commit 2a09ced1ce
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/projects_controller.rb
View File

@ -82,8 +82,9 @@ class ProjectsController < ApplicationController
def branches
return @branches = [] unless @project.forge?
result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
@branches = result.is_a?(Hash) && result.key?(:status) ? [] : result
# result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
@branches = result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
end
def branches_slice

37
app/views/projects/branches.json.jbuilder
View File

@ -1,21 +1,22 @@
json.array! @branches do |branch|
json.name branch['name']
json.user_can_push branch['user_can_push']
json.user_can_merge branch['user_can_merge']
json.protected branch['protected']
branch_name = branch.is_a?(Hash) ? branch['name'] : branch
json.name branch_name
# json.user_can_push branch['user_can_push']
# json.user_can_merge branch['user_can_merge']
# json.protected branch['protected']
json.http_url render_http_url(@project)
json.zip_url render_zip_url(@owner, @repository, branch['name'])
json.tar_url render_tar_url(@owner, @repository, branch['name'])
json.last_commit do
json.sha branch['commit']['id']
json.message branch['commit']['message']
json.timestamp render_unix_time(branch['commit']['timestamp'])
json.time_from_now time_from_now(branch['commit']['timestamp'])
json.author do
json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
end
json.committer do
json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
end
end
json.zip_url render_zip_url(@owner, @repository, branch_name)
json.tar_url render_tar_url(@owner, @repository, branch_name)
# json.last_commit do
# json.sha branch['commit']['id']
# json.message branch['commit']['message']
# json.timestamp render_unix_time(branch['commit']['timestamp'])
# json.time_from_now time_from_now(branch['commit']['timestamp'])
# json.author do
# json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['author']), name: branch['commit']['author']['name']
# end
# json.committer do
# json.partial! 'repositories/commit_author', user: render_cache_commit_author(branch['commit']['committer']), name: branch['commit']['committer']['name']
# end
# end
end