Browse Source

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

pull/347/head
yystopf 2 years ago
parent
commit
4d0225e0d9
2 changed files with 6 additions and 8 deletions
  1. +5
    -7
      app/controllers/admins/message_templates_controller.rb
  2. +1
    -1
      app/controllers/projects_controller.rb

+ 5
- 7
app/controllers/admins/message_templates_controller.rb View File

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


+ 1
- 1
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.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


Loading…
Cancel
Save