From ca6b686b88ac68550712adf74b4f68cbcac3f8ee Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Sat, 22 Feb 2025 00:06:44 +0100 Subject: [PATCH] Limit inherited contacts to model --- netbox/netbox/models/features.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py index ba895d5ed0..60084c361f 100644 --- a/netbox/netbox/models/features.py +++ b/netbox/netbox/models/features.py @@ -373,16 +373,14 @@ def get_contacts(self, inherited=True): from tenancy.models import ContactAssignment from . import NestedGroupModel - filter = Q() - for obj in [self]: - filter |= Q( - object_type=ObjectType.objects.get_for_model(obj), - object_id__in=( - obj.get_ancestors(include_self=True).values_list('pk', flat=True) - if (isinstance(obj, NestedGroupModel) and inherited) - else [obj.pk] - ), - ) + filter = Q( + object_type=ObjectType.objects.get_for_model(self), + object_id__in=( + self.get_ancestors(include_self=True).values_list('pk', flat=True) + if (isinstance(self, NestedGroupModel) and inherited) + else [self.pk] + ), + ) return ContactAssignment.objects.filter(filter)