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

更改：导入失败提示以及更改消息模板422错误

This commit is contained in:
yystopf 2024-06-04 16:55:06 +08:00
parent aa739a25b6
commit 4d0225e0d9
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/admins/message_templates_controller.rb
View File

@ -7,12 +7,12 @@ class Admins::MessageTemplatesController < Admins::BaseController
end end
def new def new
@message_template = MessageTemplate.new @message_template = MessageTemplate::CustomTip.new
end end
def create def create
@message_template = MessageTemplate::CustomTip.new(message_template_params) @message_template = MessageTemplate::CustomTip.new(ignore_params)
@message_template.type = "MessageTemplate::CustomTip"
if @message_template.save! if @message_template.save!
redirect_to admins_message_templates_path redirect_to admins_message_templates_path
flash[:success] = "创建消息模板成功" flash[:success] = "创建消息模板成功"
@ -47,9 +47,7 @@ class Admins::MessageTemplatesController < Admins::BaseController
private private
def message_template_params def message_template_params
# type = @message_template.present? ? @message_template.type : "MessageTemplate::CustomTip" params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
# params.require(type.split("::").join("_").underscore.to_sym).permit!
params.require(:message_template_custom_tip).permit!
end end
def get_template def get_template

2
app/controllers/projects_controller.rb
View File

@ -324,7 +324,7 @@ class ProjectsController < ApplicationController
@project.forked_projects.update_all(forked_from_project_id: nil) @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 @project.project_category.decrement!(:private_projects_count, 1) if @project.project_category.present? && !@project.is_public
tip_exception("导入失败，请重试！") return render_error("导入失败，请重试！")
end end
# 为了缓存活跃项目的基本信息，后续删除 # 为了缓存活跃项目的基本信息，后续删除
Cache::V2::ProjectCommonService.new(@project.id).read Cache::V2::ProjectCommonService.new(@project.id).read