2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 20:15:44 +00:00

Merge branch 'inventree:master' into matmair/issue2385

This commit is contained in:
Matthias Mair
2022-05-04 12:23:05 +02:00
committed by GitHub
45 changed files with 985 additions and 785 deletions

View File

@ -565,14 +565,14 @@ class Owner(models.Model):
try:
owners.append(cls.objects.get(owner_id=user.pk, owner_type=user_type))
except:
except: # pragma: no cover
pass
for group in user.groups.all():
try:
owner = cls.objects.get(owner_id=group.pk, owner_type=group_type)
owners.append(owner)
except:
except: # pragma: no cover
pass
return owners

View File

@ -197,6 +197,10 @@ class OwnerModelTest(TestCase):
self.assertTrue(user_as_owner in related_owners)
self.assertTrue(group_as_owner in related_owners)
# Check owner matching
owners = Owner.get_owners_matching_user(self.user)
self.assertEqual(owners, [user_as_owner, group_as_owner])
# Delete user and verify owner was deleted too
self.user.delete()
user_as_owner = Owner.get_owner(self.user)