From d691b15f4b0a42f2356c6c1563c96a862e7c8a75 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 6 Oct 2020 12:34:30 +1100
Subject: [PATCH] Fix conflicts

---
 InvenTree/users/models.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/InvenTree/users/models.py b/InvenTree/users/models.py
index 24b0318695..773dec36f7 100644
--- a/InvenTree/users/models.py
+++ b/InvenTree/users/models.py
@@ -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):