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

fix

This commit is contained in:
yystopf 2021-09-16 09:21:35 +08:00
parent 88bc5f29ff
commit cb76a946ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/send_template_message_job.rb
View File

@ -85,7 +85,7 @@ class SendTemplateMessageJob < ApplicationJob
user = User.find_by_id(user_id) user = User.find_by_id(user_id)
project = Project.find_by_id(project_id) project = Project.find_by_id(project_id)
return unless user.present? && project.present? return unless user.present? && project.present?
receivers = User.where(id: user.user_id) receivers = User.where(id: user.id)
receivers_string, content, notification_url = MessageTemplate::ProjectJoined.get_message_content(receivers, project) receivers_string, content, notification_url = MessageTemplate::ProjectJoined.get_message_content(receivers, project)
Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id}) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id})
when 'ProjectLeft' when 'ProjectLeft'
@ -93,7 +93,7 @@ class SendTemplateMessageJob < ApplicationJob
user = User.find_by_id(user_id) user = User.find_by_id(user_id)
project = Project.find_by_id(project_id) project = Project.find_by_id(project_id)
return unless user.present? && project.present? return unless user.present? && project.present?
receivers = User.where(id: user.user_id) receivers = User.where(id: user.id)
receivers_string, content, notification_url = MessageTemplate::ProjectJoined.get_message_content(receivers, project) receivers_string, content, notification_url = MessageTemplate::ProjectJoined.get_message_content(receivers, project)
Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id}) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id})
when 'ProjectRole' when 'ProjectRole'
@ -101,7 +101,7 @@ class SendTemplateMessageJob < ApplicationJob
user = User.find_by_id(user_id) user = User.find_by_id(user_id)
project = Project.find_by_id(project_id) project = Project.find_by_id(project_id)
return unless user.present? && project.present? return unless user.present? && project.present?
receivers = User.where(id: user.user_id) receivers = User.where(id: user.id)
receivers_string, content, notification_url = MessageTemplate::ProjectRole.get_message_content(receivers, project, role) receivers_string, content, notification_url = MessageTemplate::ProjectRole.get_message_content(receivers, project, role)
Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id, role: role}) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {user_id: user.id, project_id: project.id, role: role})
when 'ProjectSettingChanged' when 'ProjectSettingChanged'