From 0e31daf9a871a9f44efd6d45e597812a47e41855 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 6 Mar 2024 16:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=81=A2=E5=A4=8Dau?=
 =?UTF-8?q?to=5Finit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb      | 2 +-
 app/forms/projects/create_form.rb           | 4 ++--
 app/services/projects/create_service.rb     | 3 +--
 app/services/repositories/create_service.rb | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7a69c52ec..ca6b38360 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -283,7 +283,7 @@ class ProjectsController < ApplicationController
   private
   def project_params
     params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
-                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private, :auto_init)
+                  :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 
   def mirror_params
diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb
index 308e0aa62..81bb1d79d 100644
--- a/app/forms/projects/create_form.rb
+++ b/app/forms/projects/create_form.rb
@@ -1,6 +1,6 @@
 class Projects::CreateForm < BaseForm
   attr_accessor :user_id, :name, :description, :repository_name, :project_category_id,
-                :project_language_id, :ignore_id, :license_id, :private, :owner, :auto_init
+                :project_language_id, :ignore_id, :license_id, :private, :owner
   
   validates :user_id, :name, :repository_name, presence: true
   validates :repository_name, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "项目标识只能包含数字,字母,下划线(_),中划线(-),英文句号(.),必须以数字和字母开头，不能以下划线/中划线/英文句号开头和结尾" }
@@ -9,7 +9,7 @@ class Projects::CreateForm < BaseForm
   validates :repository_name, length: { maximum: 100 }
   validates :description, length: { maximum: 200 }
 
-  validate :check_ignore, :check_license, :check_auto_init, :check_owner, :check_max_repo_creation
+  validate :check_ignore, :check_license, :check_owner, :check_max_repo_creation
   validate do
     check_project_category(project_category_id)
     check_project_language(project_language_id)
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 408e6621c..ff36dfe52 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -61,8 +61,7 @@ class Projects::CreateService < ApplicationService
     {
       hidden: !repo_is_public,
       user_id: params[:user_id],
-      identifier: params[:repository_name],
-      auto_init: params[:auto_init]
+      identifier: params[:repository_name]
     }
   end
 
diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb
index 9fba6122e..4583838f1 100644
--- a/app/services/repositories/create_service.rb
+++ b/app/services/repositories/create_service.rb
@@ -75,7 +75,7 @@ class Repositories::CreateService < ApplicationService
       name: params[:identifier],
       private: params[:hidden],
       # readme: "ReadMe",
-      auto_init: params[:auto_init],
+      "auto_init": true,
       # "description": "string",
       # "gitignores": "string",
       # "issue_labels": "string",
@@ -89,7 +89,7 @@ class Repositories::CreateService < ApplicationService
     license = project.license
     hash = hash.merge(license: license.name) if license
     hash = hash.merge(gitignores: ignore.name) if ignore
-    hash = hash.merge(auto_init: true) if ignore && license
+    hash = hash.merge(auto_init: true) if ignore || license
     hash
   end
 end