From b56930b9ab0f6de5202fcbd7d17a8d40f8397000 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 11 Nov 2022 12:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admins/feedbacks_controller.rb | 2 +- app/models/feedback_message_history.rb | 2 ++ config/locales/zh-CN.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) 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: 开发者