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

Merge PR #483 into 11.0 

Signed-off-by hbrunn
pull/678/head
OCA-git-bot 2020-07-29 15:39:20 +00:00
parent 69f31d109e 25b298058e
commit 7f05eaf4b4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_restrict_follower_selection/models/mail_followers.py
View File

@ -13,7 +13,7 @@ class MailFollowers(models.Model):
channel_data, force=True): channel_data, force=True):
domain = self.env[ domain = self.env[
'mail.wizard.invite' 'mail.wizard.invite'
]._mail_restrict_follower_selection_get_domain() ]._mail_restrict_follower_selection_get_domain(res_model=res_model)
partners = self.env['res.partner'].search( partners = self.env['res.partner'].search(
[('id', 'in', list(partner_data))] + [('id', 'in', list(partner_data))] +
safe_eval(domain) safe_eval(domain)

6
mail_restrict_follower_selection/models/mail_wizard_invite.py
View File

@ -10,11 +10,13 @@ class MailWizardInvite(models.TransientModel):
_inherit = 'mail.wizard.invite' _inherit = 'mail.wizard.invite'
@api.model @api.model
def _mail_restrict_follower_selection_get_domain(self): def _mail_restrict_follower_selection_get_domain(self, res_model=None):
if not res_model:
res_model = self.env.context.get('default_res_model')
parameter_name = 'mail_restrict_follower_selection.domain' parameter_name = 'mail_restrict_follower_selection.domain'
return self.env['ir.config_parameter'].sudo().get_param( return self.env['ir.config_parameter'].sudo().get_param(
"{0}.{1}".format(parameter_name, "{0}.{1}".format(parameter_name,
self.env.context.get('default_res_model')), res_model),
self.env['ir.config_parameter'].sudo().get_param( self.env['ir.config_parameter'].sudo().get_param(
parameter_name, default='[]') parameter_name, default='[]')
) )