From 4d0225e0d97e7d6472a99ac8073b0f4fc60d87d4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 4 Jun 2024 16:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF422=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/message_templates_controller.rb           | 12 +++++-------
 app/controllers/projects_controller.rb               |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admins/message_templates_controller.rb b/app/controllers/admins/message_templates_controller.rb
index 6a5000c24..af77858e1 100644
--- a/app/controllers/admins/message_templates_controller.rb
+++ b/app/controllers/admins/message_templates_controller.rb
@@ -7,12 +7,12 @@ class Admins::MessageTemplatesController < Admins::BaseController
   end
 
   def new 
-    @message_template = MessageTemplate.new
+    @message_template = MessageTemplate::CustomTip.new
   end
 
-  def create
-    @message_template = MessageTemplate::CustomTip.new(message_template_params)
-    @message_template.type = "MessageTemplate::CustomTip"
+  def create 
+    @message_template = MessageTemplate::CustomTip.new(ignore_params)
+
     if @message_template.save!
       redirect_to admins_message_templates_path 
       flash[:success] = "创建消息模板成功"
@@ -47,9 +47,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
 
   private 
   def message_template_params
-    # type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip"
-    # params.require(type.split("::").join("_").underscore.to_sym).permit!
-    params.require(:message_template_custom_tip).permit!
+    params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
   end
 
   def get_template
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1c0857cf5..074225e43 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -324,7 +324,7 @@ class ProjectsController < ApplicationController
       @project.forked_projects.update_all(forked_from_project_id: nil)
       # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量
       @project.project_category.decrement!(:private_projects_count, 1) if @project.project_category.present? && !@project.is_public
-      tip_exception("导入失败，请重试！")
+      return render_error("导入失败，请重试！")
     end
     # 为了缓存活跃项目的基本信息，后续删除
     Cache::V2::ProjectCommonService.new(@project.id).read