From 8adc0bd3748d57ccbaabcb79b4a9d891e11112f4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 4 Dec 2025 15:30:02 -0500 Subject: [PATCH] Refactor filterset forms to use OwnerFilterMixin --- netbox/netbox/forms/filtersets.py | 32 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/netbox/netbox/forms/filtersets.py b/netbox/netbox/forms/filtersets.py index d5967c24b..ca9b44836 100644 --- a/netbox/netbox/forms/filtersets.py +++ b/netbox/netbox/forms/filtersets.py @@ -44,34 +44,30 @@ class NetBoxModelFilterSetForm(CustomFieldsMixin, SavedFiltersMixin, forms.Form) return customfield.to_form_field(set_initial=False, enforce_required=False, enforce_visibility=False) -class PrimaryModelFilterSetForm(NetBoxModelFilterSetForm): +class OwnerFilterMixin(forms.Form): + owner_id = DynamicModelChoiceField( + queryset=Owner.objects.all(), + required=False, + label=_('Owner'), + ) + + +class PrimaryModelFilterSetForm(OwnerFilterMixin, NetBoxModelFilterSetForm): """ FilterSet form for models which inherit from PrimaryModel. """ - owner_id = DynamicModelChoiceField( - queryset=Owner.objects.all(), - required=False, - label=_('Owner'), - ) + pass -class OrganizationalModelFilterSetForm(NetBoxModelFilterSetForm): +class OrganizationalModelFilterSetForm(OwnerFilterMixin, NetBoxModelFilterSetForm): """ FilterSet form for models which inherit from OrganizationalModel. """ - owner_id = DynamicModelChoiceField( - queryset=Owner.objects.all(), - required=False, - label=_('Owner'), - ) + pass -class NestedGroupModelFilterSetForm(NetBoxModelFilterSetForm): +class NestedGroupModelFilterSetForm(OwnerFilterMixin, NetBoxModelFilterSetForm): """ FilterSet form for models which inherit from NestedGroupModel. """ - owner_id = DynamicModelChoiceField( - queryset=Owner.objects.all(), - required=False, - label=_('Owner'), - ) + pass