mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Fix conflicts
This commit is contained in:
parent
11d31960c7
commit
d691b15f4b
@ -328,7 +328,12 @@ def create_missing_rule_sets(sender, instance, **kwargs):
|
||||
group permissions.
|
||||
"""
|
||||
|
||||
update_group_roles(instance)
|
||||
created = kwargs.get('created', False)
|
||||
# To trigger the group permissions update: update_fields should not be None
|
||||
update_fields = kwargs.get('update_fields', None)
|
||||
|
||||
if created or update_fields:
|
||||
update_group_roles(instance)
|
||||
|
||||
|
||||
def check_user_role(user, role, permission):
|
||||
|
Loading…
Reference in New Issue
Block a user