anph
/
forgeplus
forked from Trustie/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：反馈意见发送邮件失败错误返回

This commit is contained in:
yystopf 2022-11-11 12:25:25 +08:00
parent f98886b3a0
commit b56930b9ab
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admins/feedbacks_controller.rb
View File

@ -25,7 +25,7 @@ class Admins::FeedbacksController < Admins::BaseController
def create_history def create_history
@feedback_message_history = @feedback.feedback_message_histories.new(feedback_message_history_params) @feedback_message_history = @feedback.feedback_message_histories.new(feedback_message_history_params)
@feedback_message_history.user = current_user @feedback_message_history.user = current_user
if @feedback_message_history.save! if @feedback_message_history.save
redirect_to admins_feedbacks_path redirect_to admins_feedbacks_path
flash[:success] = "发送通知成功" flash[:success] = "发送通知成功"
else else

2
app/models/feedback_message_history.rb
View File

@ -29,6 +29,8 @@ class FeedbackMessageHistory < ApplicationRecord
unless UserMailer.feedback_email(feedback&.user&.mail, title, content).deliver_now unless UserMailer.feedback_email(feedback&.user&.mail, title, content).deliver_now
errors[:title] << '邮件发送失败！' errors[:title] << '邮件发送失败！'
end end
rescue
errors[:title] << '邮件发送失败！'
end end
end end

2
config/locales/zh-CN.yml
View File

@ -231,6 +231,8 @@ zh-CN:
ignore: ignore:
name: 'git忽略文件名称' name: 'git忽略文件名称'
content: 'git忽略文件内容' content: 'git忽略文件内容'
feedback_message_history:
title: ''
close_pr: 合并请求 close_pr: 合并请求
roles: roles:
Developer: 开发者 Developer: 开发者