devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from expsa/samir-aladawi-fix-conflicts-on-message-post-function 

[FIX] odex_web_app: conflicts on message_post function
This commit is contained in:
AbuzarExp 2024-07-08 12:11:32 +03:00 committed by GitHub
parent 67c1d63994 3691313bb5
commit ea99859dfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
odex25_mobile/odex_web_app/models/mail_thread.py
View File

@ -7,15 +7,16 @@ class MailThread(models.AbstractModel):
@api.returns('mail.message', lambda value: value.id)
def message_post(self, *, message_type='notification', **kwargs):
notification_body = kwargs.get('body', '')
attachments = len(kwargs.get('attachment_ids', []))
if notification_body and attachments:
notification_body += '\n{} File(s)'.format(attachments)
elif attachments:
notification_body = '{} File(s)'.format(attachments)
if self._name in ['mail.channel']:
notification_body = kwargs.get('body', '')
attachments = len(kwargs.get('attachment_ids', []))
if notification_body and attachments:
notification_body += '\n{} File(s)'.format(attachments)
elif attachments:
notification_body = '{} File(s)'.format(attachments)
partners_to_notify = self.channel_partner_ids.filtered(lambda r: r.id != self.env.user.partner_id.id)
for employee_id in self.env['hr.employee'].sudo().search([('user_id', 'in', partners_to_notify.user_ids.ids)]):
push_notify = employee_id.user_push_notification_web(notification_body)
return super(MailThread, self).message_post(message_type=message_type, **kwargs)
partners_to_notify = self.channel_partner_ids.filtered(lambda r: r.id != self.env.user.partner_id.id)
for employee_id in self.env['hr.employee'].sudo().search([('user_id', 'in', partners_to_notify.user_ids.ids)]):
push_notify = employee_id.user_push_notification_web(notification_body)
return super(MailThread, self).message_post(message_type=message_type, **kwargs)