mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-15 19:45:46 +00:00
Fix conflicts
This commit is contained in:
@ -328,7 +328,12 @@ def create_missing_rule_sets(sender, instance, **kwargs):
|
|||||||
group permissions.
|
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):
|
def check_user_role(user, role, permission):
|
||||||
|
Reference in New Issue
Block a user