audrius/server-backend
1
0
Fork 0
mirror of https://github.com/OCA/server-backend.git synced 2025-02-18 09:52:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[FIX] Crash in base_user_role when role_id is not set on res.users.role.line"

Browse Source 
This reverts commit b537941d5a2d1fcb3fbacc602124c1b3f6e1d495.
This commit is contained in:
Pierrick Brun
2019-01-29 14:27:05 +01:00
committed by Jesús Alan Ramos Rodríguez
parent 31395f31ee
commit afc6eaf947
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
base_user_role/models/user.py
View File

@@ -70,7 +70,6 @@ class ResUsers(models.Model):
lambda rec: rec.is_enabled) lambda rec: rec.is_enabled)
for role_line in role_lines: for role_line in role_lines:
role = role_line.role_id role = role_line.role_id
if role:
group_ids += role_groups[role] group_ids += role_groups[role]
group_ids = list(set(group_ids)) # Remove duplicates IDs group_ids = list(set(group_ids)) # Remove duplicates IDs
groups_to_add = list(set(group_ids) - set(user.groups_id.ids)) groups_to_add = list(set(group_ids) - set(user.groups_id.ids))

2
base_user_role/views/user.xml
View File

@@ -13,7 +13,7 @@
<page string="Roles"> <page string="Roles">
<field name="role_line_ids" nolabel="1"> <field name="role_line_ids" nolabel="1">
<tree editable="bottom" decoration-muted="not is_enabled"> <tree editable="bottom" decoration-muted="not is_enabled">
<field name="role_id" required="1"/> <field name="role_id"/>
<field name="date_from"/> <field name="date_from"/>
<field name="date_to"/> <field name="date_to"/>
<field name="is_enabled"/> <field name="is_enabled"/>