Merge branch 'develop' into standalone_develop

app/models/message_template/project_milestone_early_expired.rb

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

app/models/template_message_setting/create_or_assign.rb

@@ -28,5 +28,6 @@ class TemplateMessageSetting::CreateOrAssign < TemplateMessageSetting
     self.find_or_create_by(name: "疑修状态变更", key: "IssueChanged")
     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: "MilestoneExpired", notification_disabled: false, email_disabled: true)
   end
 end

app/models/user_template_message_setting.rb

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