Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #350 from Eficent/11.0-fix-mail_activity_team 

[FIX] mail_activity_team
pull/355/head
Jordi Ballester Alomar 2019-01-09 18:04:07 +01:00 committed by GitHub
parent 66843331ea 8e0898108f
commit 649c87f86b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mail_activity_team/models/mail_activity.py
View File

@ -46,14 +46,13 @@ class MailActivity(models.Model):
if not self.team_id: if not self.team_id:
return res return res
res['domain']['user_id'] = [('id', 'in', self.team_id.member_ids.ids)] res['domain']['user_id'] = [('id', 'in', self.team_id.member_ids.ids)]
if self.team_id.user_id: if self.user_id not in self.team_id.member_ids:
self.user_id = self.team_id.user_id if self.team_id.user_id:
elif len(self.team_id.member_ids.ids) == 1: self.user_id = self.team_id.user_id
self.user_id = self.team_id.member_ids elif len(self.team_id.member_ids) == 1:
elif self.env.user.id in self.team_id.member_ids.ids: self.user_id = self.team_id.member_ids
self.user_id = self.env.user else:
else: self.user_id = self.env['res.users']
self.user_id = self.env['res.users']
return res return res
@api.multi @api.multi