Skip to content
Snippets Groups Projects
Verified Commit 07021fe2 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix group sync (exclude persons without user)

parent 79c0eaa7
No related branches found
No related tags found
1 merge request!221Fix group sync
Pipeline #1323 failed
......@@ -192,7 +192,7 @@ class Person(ExtensibleModel):
self.user.save()
# Save all related groups once to keep synchronisation with Django
for group in self.member_of.union(self.owner_of).all():
for group in self.member_of.union(self.owner_of.all()).all():
group.save()
self.auto_select_primary_group()
......@@ -272,7 +272,9 @@ class Group(ExtensibleModel):
dj_group, _ = DjangoGroup.objects.get_or_create(name=self.name)
dj_group.user_set.set(
list(
self.members.values_list("user", flat=True).union(self.owners.values_list("user", flat=True))
self.members.filter(user__isnull=False).values_list("user", flat=True).union(
self.owners.filter(user__isnull=False).values_list("user", flat=True)
)
)
)
dj_group.save()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment