diff --git a/app/controllers/admins/feedbacks_controller.rb b/app/controllers/admins/feedbacks_controller.rb index 4ef3c455c..ff64ae5a1 100644 --- a/app/controllers/admins/feedbacks_controller.rb +++ b/app/controllers/admins/feedbacks_controller.rb @@ -25,7 +25,7 @@ class Admins::FeedbacksController < Admins::BaseController def create_history @feedback_message_history = @feedback.feedback_message_histories.new(feedback_message_history_params) @feedback_message_history.user = current_user - if @feedback_message_history.save! + if @feedback_message_history.save redirect_to admins_feedbacks_path flash[:success] = "发送通知成功" else diff --git a/app/models/feedback_message_history.rb b/app/models/feedback_message_history.rb index 6d338d73c..90ae185e0 100644 --- a/app/models/feedback_message_history.rb +++ b/app/models/feedback_message_history.rb @@ -29,6 +29,8 @@ class FeedbackMessageHistory < ApplicationRecord unless UserMailer.feedback_email(feedback&.user&.mail, title, content).deliver_now errors[:title] << '邮件发送失败!' end + rescue + errors[:title] << '邮件发送失败!' end end diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 623a4d1c9..e7c586417 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -231,6 +231,8 @@ zh-CN: ignore: name: 'git忽略文件名称' content: 'git忽略文件内容' + feedback_message_history: + title: '' close_pr: 合并请求 roles: Developer: 开发者