Browse Source

Fixes #1705: Fixed filtering of devices with a status of offline

Jeremy Stretch 7 years ago
parent
commit
8d6d55d628
3 changed files with 10 additions and 5 deletions
  1. 2 1
      netbox/dcim/filters.py
  2. 6 3
      netbox/ipam/filters.py
  3. 2 1
      netbox/virtualization/filters.py

+ 2 - 1
netbox/dcim/filters.py

@@ -425,7 +425,8 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Device model (slug)',
         label='Device model (slug)',
     )
     )
     status = django_filters.MultipleChoiceFilter(
     status = django_filters.MultipleChoiceFilter(
-        choices=STATUS_CHOICES
+        choices=STATUS_CHOICES,
+        null_value=None
     )
     )
     is_full_depth = django_filters.BooleanFilter(
     is_full_depth = django_filters.BooleanFilter(
         name='device_type__is_full_depth',
         name='device_type__is_full_depth',

+ 6 - 3
netbox/ipam/filters.py

@@ -165,7 +165,8 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Role (slug)',
         label='Role (slug)',
     )
     )
     status = django_filters.MultipleChoiceFilter(
     status = django_filters.MultipleChoiceFilter(
-        choices=PREFIX_STATUS_CHOICES
+        choices=PREFIX_STATUS_CHOICES,
+        null_value=None
     )
     )
 
 
     class Meta:
     class Meta:
@@ -270,7 +271,8 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Interface (ID)',
         label='Interface (ID)',
     )
     )
     status = django_filters.MultipleChoiceFilter(
     status = django_filters.MultipleChoiceFilter(
-        choices=IPADDRESS_STATUS_CHOICES
+        choices=IPADDRESS_STATUS_CHOICES,
+        null_value=None
     )
     )
     role = django_filters.MultipleChoiceFilter(
     role = django_filters.MultipleChoiceFilter(
         choices=IPADDRESS_ROLE_CHOICES
         choices=IPADDRESS_ROLE_CHOICES
@@ -369,7 +371,8 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet):
         label='Role (slug)',
         label='Role (slug)',
     )
     )
     status = django_filters.MultipleChoiceFilter(
     status = django_filters.MultipleChoiceFilter(
-        choices=VLAN_STATUS_CHOICES
+        choices=VLAN_STATUS_CHOICES,
+        null_value=None
     )
     )
 
 
     class Meta:
     class Meta:

+ 2 - 1
netbox/virtualization/filters.py

@@ -70,7 +70,8 @@ class VirtualMachineFilter(CustomFieldFilterSet):
         label='Search',
         label='Search',
     )
     )
     status = django_filters.MultipleChoiceFilter(
     status = django_filters.MultipleChoiceFilter(
-        choices=STATUS_CHOICES
+        choices=STATUS_CHOICES,
+        null_value=None
     )
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         name='cluster__group',
         name='cluster__group',