Просмотр исходного кода

Closes #7323: Add serial filter field for racks & devices

jeremystretch 4 лет назад
Родитель
Сommit
2a1718bfc8
2 измененных файлов с 12 добавлено и 2 удалено
  1. 4 0
      docs/release-notes/version-3.0.md
  2. 8 2
      netbox/dcim/forms.py

+ 4 - 0
docs/release-notes/version-3.0.md

@@ -2,6 +2,10 @@
 
 
 ## v3.0.4 (FUTURE)
 ## v3.0.4 (FUTURE)
 
 
+### Enhancements
+
+* [#7323](https://github.com/netbox-community/netbox/issues/7323) - Add serial filter field for racks & devices
+
 ### Bug Fixes
 ### Bug Fixes
 
 
 * [#7321](https://github.com/netbox-community/netbox/issues/7321) - Don't overwrite multi-select custom fields during bulk edit
 * [#7321](https://github.com/netbox-community/netbox/issues/7321) - Don't overwrite multi-select custom fields during bulk edit

+ 8 - 2
netbox/dcim/forms.py

@@ -938,7 +938,7 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo
         ['q', 'tag'],
         ['q', 'tag'],
         ['region_id', 'site_id', 'location_id'],
         ['region_id', 'site_id', 'location_id'],
         ['status', 'role_id'],
         ['status', 'role_id'],
-        ['type', 'width', 'asset_tag'],
+        ['type', 'width', 'serial', 'asset_tag'],
         ['tenant_group_id', 'tenant_id'],
         ['tenant_group_id', 'tenant_id'],
     ]
     ]
     q = forms.CharField(
     q = forms.CharField(
@@ -993,6 +993,9 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo
         label=_('Role'),
         label=_('Role'),
         fetch_trigger='open'
         fetch_trigger='open'
     )
     )
+    serial = forms.CharField(
+        required=False
+    )
     asset_tag = forms.CharField(
     asset_tag = forms.CharField(
         required=False
         required=False
     )
     )
@@ -2590,7 +2593,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
     field_groups = [
     field_groups = [
         ['q', 'tag'],
         ['q', 'tag'],
         ['region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id'],
         ['region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id'],
-        ['status', 'role_id', 'asset_tag', 'mac_address'],
+        ['status', 'role_id', 'serial', 'asset_tag', 'mac_address'],
         ['manufacturer_id', 'device_type_id', 'platform_id'],
         ['manufacturer_id', 'device_type_id', 'platform_id'],
         ['tenant_group_id', 'tenant_id'],
         ['tenant_group_id', 'tenant_id'],
         [
         [
@@ -2679,6 +2682,9 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         required=False,
         required=False,
         widget=StaticSelectMultiple()
         widget=StaticSelectMultiple()
     )
     )
+    serial = forms.CharField(
+        required=False
+    )
     asset_tag = forms.CharField(
     asset_tag = forms.CharField(
         required=False
         required=False
     )
     )