diff --git a/netbox/vpn/filtersets.py b/netbox/vpn/filtersets.py index 1408cf044..5b8a09bc6 100644 --- a/netbox/vpn/filtersets.py +++ b/netbox/vpn/filtersets.py @@ -25,7 +25,7 @@ __all__ = ( ) -class TunnelGroupFilterSet(OrganizationalModelFilterSet): +class TunnelGroupFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet): class Meta: model = TunnelGroup diff --git a/netbox/vpn/forms/filtersets.py b/netbox/vpn/forms/filtersets.py index dc3109156..cff83362f 100644 --- a/netbox/vpn/forms/filtersets.py +++ b/netbox/vpn/forms/filtersets.py @@ -30,8 +30,12 @@ __all__ = ( ) -class TunnelGroupFilterForm(NetBoxModelFilterSetForm): +class TunnelGroupFilterForm(NetBoxModelFilterSetForm, ContactModelFilterForm): model = TunnelGroup + fieldsets = ( + FieldSet('q', 'filter_id', 'tag'), + FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')), + ) tag = TagFilterField(model)