From 16c8dffe7c50440e4b521b17ca0598670b6f2355 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 18c4ef548..53530ea6e 100644 --- a/netbox/netbox/forms/filtersets.py +++ b/netbox/netbox/forms/filtersets.py @@ -45,34 +45,30 @@ class NetBoxModelFilterSetForm(FilterModifierMixin, CustomFieldsMixin, SavedFilt 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