Explorar el Código

Merge pull request #20591 from pheus/20554-add-missing-contenttypefilter-to-filtersets

Fixes #20554: Add ContentTypeFilter to several filtersets
bctiemann hace 4 meses
padre
commit
389c44e5d6
Se han modificado 3 ficheros con 5 adiciones y 0 borrados
  1. 2 0
      netbox/core/filtersets.py
  2. 1 0
      netbox/dcim/filtersets.py
  3. 2 0
      netbox/ipam/filtersets.py

+ 2 - 0
netbox/core/filtersets.py

@@ -80,6 +80,7 @@ class JobFilterSet(BaseFilterSet):
         method='search',
         method='search',
         label=_('Search'),
         label=_('Search'),
     )
     )
+    object_type = ContentTypeFilter()
     created = django_filters.DateTimeFilter()
     created = django_filters.DateTimeFilter()
     created__before = django_filters.DateTimeFilter(
     created__before = django_filters.DateTimeFilter(
         field_name='created',
         field_name='created',
@@ -169,6 +170,7 @@ class ObjectChangeFilterSet(BaseFilterSet):
     changed_object_type_id = django_filters.ModelMultipleChoiceFilter(
     changed_object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ContentType.objects.all()
         queryset=ContentType.objects.all()
     )
     )
+    related_object_type = ContentTypeFilter()
     user_id = django_filters.ModelMultipleChoiceFilter(
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
         queryset=User.objects.all(),
         label=_('User (ID)'),
         label=_('User (ID)'),

+ 1 - 0
netbox/dcim/filtersets.py

@@ -1764,6 +1764,7 @@ class PowerOutletFilterSet(
 
 
 class MACAddressFilterSet(NetBoxModelFilterSet):
 class MACAddressFilterSet(NetBoxModelFilterSet):
     mac_address = MultiValueMACAddressFilter()
     mac_address = MultiValueMACAddressFilter()
+    assigned_object_type = ContentTypeFilter()
     device = MultiValueCharFilter(
     device = MultiValueCharFilter(
         method='filter_device',
         method='filter_device',
         field_name='name',
         field_name='name',

+ 2 - 0
netbox/ipam/filtersets.py

@@ -595,6 +595,7 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFil
         to_field_name='rd',
         to_field_name='rd',
         label=_('VRF (RD)'),
         label=_('VRF (RD)'),
     )
     )
+    assigned_object_type = ContentTypeFilter()
     device = MultiValueCharFilter(
     device = MultiValueCharFilter(
         method='filter_device',
         method='filter_device',
         field_name='name',
         field_name='name',
@@ -1152,6 +1153,7 @@ class ServiceTemplateFilterSet(NetBoxModelFilterSet):
 
 
 
 
 class ServiceFilterSet(ContactModelFilterSet, NetBoxModelFilterSet):
 class ServiceFilterSet(ContactModelFilterSet, NetBoxModelFilterSet):
+    parent_object_type = ContentTypeFilter()
     device = MultiValueCharFilter(
     device = MultiValueCharFilter(
         method='filter_device',
         method='filter_device',
         field_name='name',
         field_name='name',