Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚡ mail_private New: internal users are flagged automatically #193

Merged
merged 4 commits into from
Oct 10, 2019
Merged

⚡ mail_private New: internal users are flagged automatically #193

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc184cc
:zap: mail_private New: internal users are flagged automatically
Ommo73 May 21, 2019
3a86b45
Merge branch '12.0' into 12.0-mail_private-internal_users_checked
Ommo73 Aug 13, 2019
2799e60
:rainbow: mail_private: refactored
Ommo73 May 21, 2019
ee4c0bd
:book: mail_multi_website: to long module name
Ommo73 Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions mail_private/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ def send_recepients_for_internal_message(self, model, domain):
result = []
default_resource = self.env[model].search(domain)
follower_ids = default_resource.message_follower_ids
internal_ids = self.get_internal_users_ids()

recipient_ids = [r.partner_id for r in follower_ids if r.partner_id]
# channel_ids = [c.channel_id for c in follower_ids if c.channel_id]

for recipient in recipient_ids:
result.append({
'checked': recipient.user_ids.id in internal_ids,
'checked': recipient.user_ids.id and not any(recipient.user_ids.mapped('share')),
'partner_id': recipient.id,
'full_name': recipient.name,
'name': recipient.name,
Expand Down Expand Up @@ -62,7 +61,3 @@ def _notify_compute_internal_recipients(self, record, msg_vals):
pids = [x[1] for x in msg_vals.get('partner_ids')] if 'partner_ids' in msg_vals else self.sudo().partner_ids.ids
recipient_data['partners'] = [i for i in recipient_data['partners'] if i['id'] in pids]
return recipient_data

def get_internal_users_ids(self):
internal_users_ids = self.env['res.users'].search([('share', '=', False)]).ids
return internal_users_ids