Browse Source

修复

pull/343/head
yystopf 3 years ago
parent
commit
36dbf76d80
4 changed files with 9 additions and 7 deletions
  1. +5
    -4
      app/services/api/v1/projects/branches/list_service.rb
  2. +1
    -1
      app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
  3. +1
    -1
      app/views/api/v1/projects/branches/create.json.jbuilder
  4. +2
    -1
      app/views/api/v1/projects/branches/index.json.jbuilder

+ 5
- 4
app/services/api/v1/projects/branches/list_service.rb View File

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

+ 1
- 1
app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder View File

@@ -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
app/views/api/v1/projects/branches/create.json.jbuilder View File

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

+ 2
- 1
app/views/api/v1/projects/branches/index.json.jbuilder View File

@@ -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…
Cancel
Save