From 36dbf76d808718526d88216a32cddc1861334e8a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Feb 2023 13:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/branches/list_service.rb    | 9 +++++----
 .../projects/branches/_simple_gitea_detail.json.jbuilder | 2 +-
 app/views/api/v1/projects/branches/create.json.jbuilder  | 2 +-
 app/views/api/v1/projects/branches/index.json.jbuilder   | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index f53dc1f49..590c4884f 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -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
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
index 98890eba4..c9235bdb4 100644
--- a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
+++ b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
@@ -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'])
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/create.json.jbuilder b/app/views/api/v1/projects/branches/create.json.jbuilder
index eed860b81..b7de0f576 100644
--- a/app/views/api/v1/projects/branches/create.json.jbuilder
+++ b/app/views/api/v1/projects/branches/create.json.jbuilder
@@ -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]
diff --git a/app/views/api/v1/projects/branches/index.json.jbuilder b/app/views/api/v1/projects/branches/index.json.jbuilder
index cfb9bb647..80b3e4d03 100644
--- a/app/views/api/v1/projects/branches/index.json.jbuilder
+++ b/app/views/api/v1/projects/branches/index.json.jbuilder
@@ -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
\ No newline at end of file