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

merge from develop

This commit is contained in:
yystopf 2022-11-09 14:42:40 +08:00
parent 33a3d7f48c 6d9cf8aad2
commit c3703a7f69
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/feedback_message_history.rb
View File

@ -26,7 +26,7 @@ class FeedbackMessageHistory < ApplicationRecord
private private
def send_meessage_email def send_meessage_email
unless UserMailer.update_email(mail, verification_code).deliver_now unless UserMailer.feedback_email(user&.mail, title, content).deliver_now
errors[:title] << '邮件发送失败！' errors[:title] << '邮件发送失败！'
end end
end end

1
app/models/user.rb
View File

@ -177,6 +177,7 @@ class User < Owner
has_one :trace_user, dependent: :destroy has_one :trace_user, dependent: :destroy
has_many :user_trace_tasks, dependent: :destroy has_many :user_trace_tasks, dependent: :destroy
has_many :feedbacks, dependent: :destroy
# Groups and active users # Groups and active users
scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
scope :like, lambda { |keywords| scope :like, lambda { |keywords|