Skip to content

[FIX] base_user_role: don't reset notification_type #456

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

Open
mprechl wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[FIX] base_user_role: don't reset notification_type #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion base_user_role/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "User roles",
"version": "19.0.1.0.2",
"version": "19.0.1.0.1",
"category": "Tools",
"author": "ABF OSIELL, Odoo Community Association (OCA)",
"license": "LGPL-3",
Expand Down
13 changes: 11 additions & 2 deletions base_user_role/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ def write(self, vals):
def _get_enabled_roles(self):
return self.role_line_ids.filtered(lambda rec: rec.is_enabled)

@api.model
def _get_self_writable_groups(self):
group = self.env.ref(
"mail.group_mail_notification_type_inbox", raise_if_not_found=False
)
return group or self.env["res.groups"]

def set_groups_from_roles(self, force=False):
"""Set (replace) the groups following the roles defined on users.
If no role is defined on the user, its groups are let untouched unless
Expand All @@ -71,6 +78,7 @@ def set_groups_from_roles(self, force=False):
for role in self.mapped("role_line_ids.role_id"):
# v19: use transitive implied groups provided by ORM
role_groups[role] = list(set(role.all_implied_ids.ids))
self_writable_group_ids = self._get_self_writable_groups().ids
for user in self:
if not user.role_line_ids and not force:
continue
Expand All @@ -91,8 +99,9 @@ def set_groups_from_roles(self, force=False):
)
if other_admins == 0:
group_ids.append(admin_group.id)
groups_to_add = list(set(group_ids) - set(user.group_ids.ids))
groups_to_remove = list(set(user.group_ids.ids) - set(group_ids))
user_group_ids = set(user.group_ids.ids).difference(self_writable_group_ids)
groups_to_add = list(set(group_ids) - user_group_ids)
groups_to_remove = list(user_group_ids - set(group_ids))
to_add = [fields.Command.link(gr) for gr in groups_to_add]
to_remove = [fields.Command.unlink(gr) for gr in groups_to_remove]
groups = to_remove + to_add
Expand Down
Loading