Merge branch 'develop' into standalone_develop

app/models/message_template/issue_assigned.rb

@@ -26,7 +26,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate
     project = issue&.project
     owner = project&.owner 
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::IssueAssigned.get_message_content [ERROR] #{e}")
@@ -52,7 +52,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate
       content.gsub!('{repository}', project&.name)
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', issue&.subject)
-      content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{id}', issue&.project_issues_index.to_s)
       content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content

app/models/message_template/issue_assigner_expire.rb

@@ -20,7 +20,7 @@ class MessageTemplate::IssueAssignerExpire < MessageTemplate
     project = issue&.project
     owner = project&.owner
     content = sys_notice.gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::IssueAssignerExpire.get_message_content [ERROR] #{e}")

app/models/message_template/issue_atme.rb

@@ -20,7 +20,7 @@ class MessageTemplate::IssueAtme < MessageTemplate
     project = issue&.project 
     owner = project&.owner 
     content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
     return receivers_string(receivers), content, url
   rescue => e
     Rails.logger.info("MessageTemplate::IssueAtme.get_message_content [ERROR] #{e}")

app/models/message_template/issue_changed.rb

@@ -27,7 +27,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
     project = issue&.project 
     owner = project&.owner 
     content = MessageTemplate::IssueChanged.sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
     change_count = change_params.keys.size
     # 疑修负责人修改
     if change_params[:assigned_to_id].present?
@@ -205,7 +205,7 @@ class MessageTemplate::IssueChanged < MessageTemplate
       content.gsub!('{identifier}', project&.identifier)
       content.gsub!('{repository}', project&.name)
       content.gsub!('{title}', issue&.subject)
-      content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{id}', issue&.project_issues_index.to_s)
       change_count = change_params.keys.size
       # 疑修负责人修改
       if change_params[:assigned_to_id].present?

app/models/message_template/issue_expire.rb

@@ -28,7 +28,7 @@ class MessageTemplate::IssueExpire < MessageTemplate
     project = issue&.project
     owner = project&.owner
     content = sys_notice.gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
 
     return receivers_string(receivers), content, url
   rescue => e
@@ -53,7 +53,7 @@ class MessageTemplate::IssueExpire < MessageTemplate
       content.gsub!('{repository}', project&.name)
       content.gsub!('{baseurl}', base_url)
       content.gsub!('{title}', issue&.subject)
-      content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{id}', issue&.project_issues_index.to_s)
       content.gsub!('{platform}', PLATFORM)
   
       return receiver&.mail, title, content

app/models/message_template/project_issue.rb

@@ -27,7 +27,7 @@ class MessageTemplate::ProjectIssue < MessageTemplate
     receivers = managers + followers
     return '', '', '' if receivers.blank?
     content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject)
-    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s)
+    url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s)
     
     return receivers_string(receivers), content, url
   rescue => e
@@ -54,7 +54,7 @@ class MessageTemplate::ProjectIssue < MessageTemplate
       content.gsub!('{repository}', project&.name)
       content.gsub!('{login2}', owner&.login)
       content.gsub!('{identifier}', project&.identifier)
-      content.gsub!('{id}', issue&.id.to_s)
+      content.gsub!('{id}', issue&.project_issues_index.to_s)
       content.gsub!('{title}', issue&.subject)
       content.gsub!('{platform}', PLATFORM)