Gitlink
/
forgeplus
40
1
Fork 57
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2024-03-12 15:23:12 +08:00
parent 780ba6c103 f3f63e3dd3
commit 597d77ba85
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/message_template/project_milestone_early_expired.rb
View File

@ -19,8 +19,8 @@ class MessageTemplate::ProjectMilestoneEarlyExpired < MessageTemplate
def self.get_message_content(receivers, milestone) def self.get_message_content(receivers, milestone)
receivers.each do |receiver| receivers.each do |receiver|
if receiver.user_template_message_setting.present? if receiver.user_template_message_setting.present?
send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneEarlyExpired"] send_setting = receiver.user_template_message_setting.notification_body["ManageProject::MilestoneExpired"]
send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneEarlyExpired"] : send_setting send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_notification_body["ManageProject::MilestoneExpired"] : send_setting
receivers = receivers.where.not(id: receiver.id) unless send_setting receivers = receivers.where.not(id: receiver.id) unless send_setting
end end
end end
@ -38,8 +38,8 @@ class MessageTemplate::ProjectMilestoneEarlyExpired < MessageTemplate
def self.get_email_message_content(receiver, milestone) def self.get_email_message_content(receiver, milestone)
if receiver.user_template_message_setting.present? if receiver.user_template_message_setting.present?
send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneEarlyExpired"] send_setting = receiver.user_template_message_setting.email_body["ManageProject::MilestoneExpired"]
send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneEarlyExpired"] : send_setting send_setting = send_setting.nil? ? UserTemplateMessageSetting.init_email_body["ManageProject::MilestoneExpired"] : send_setting
return '', '', '' unless send_setting return '', '', '' unless send_setting
project = milestone&.project project = milestone&.project
owner = project&.owner owner = project&.owner

1
app/models/template_message_setting/create_or_assign.rb
View File

@ -28,5 +28,6 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged") self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged")
self.find_or_create_by(name: "合并请求状态变更", key: "PullRequestChanged") self.find_or_create_by(name: "合并请求状态变更", key: "PullRequestChanged")
self.find_or_create_by(name: "疑修截止日期到达最后一天", key: "IssueExpire", notification_disabled: false) self.find_or_create_by(name: "疑修截止日期到达最后一天", key: "IssueExpire", notification_disabled: false)
self.find_or_create_by(name: "里程碑逾期提醒", key: "MilestoneExpired", notification_disabled: false, email_disabled: true)
end end
end end

2
app/models/user_template_message_setting.rb
View File

@ -36,6 +36,7 @@ class UserTemplateMessageSetting < ApplicationRecord
"CreateOrAssign::IssueChanged": true, "CreateOrAssign::IssueChanged": true,
"CreateOrAssign::PullRequestChanged": true, "CreateOrAssign::PullRequestChanged": true,
"CreateOrAssign::IssueExpire": true, "CreateOrAssign::IssueExpire": true,
"CreateOrAssign::MilestoneExpired": true,
"ManageProject::Issue": true, "ManageProject::Issue": true,
"ManageProject::PullRequest": true, "ManageProject::PullRequest": true,
"ManageProject::Member": true, "ManageProject::Member": true,
@ -59,6 +60,7 @@ class UserTemplateMessageSetting < ApplicationRecord
"CreateOrAssign::IssueChanged": false, "CreateOrAssign::IssueChanged": false,
"CreateOrAssign::PullRequestChanged": false, "CreateOrAssign::PullRequestChanged": false,
"CreateOrAssign::IssueExpire": false, "CreateOrAssign::IssueExpire": false,
"CreateOrAssign::MilestoneExpired": false,
"ManageProject::Issue": false, "ManageProject::Issue": false,
"ManageProject::PullRequest": false, "ManageProject::PullRequest": false,
"ManageProject::Member": false, "ManageProject::Member": false,