From f822ae55c59d79f21a4706516164dd100e500043 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 28 Mar 2025 10:47:38 -0700 Subject: [PATCH] 18981 review changes --- netbox/dcim/forms/bulk_edit.py | 2 +- netbox/extras/filtersets.py | 10 ++++------ netbox/extras/forms/filtersets.py | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 043a94dc7..a77c7fa9c 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -650,7 +650,7 @@ class DeviceRoleBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( FieldSet('parent', 'color', 'vm_role', 'config_template', 'description'), ) - nullable_fields = ('color', 'config_template', 'description', 'comments') + nullable_fields = ('parent', 'color', 'config_template', 'description', 'comments') class PlatformBulkEditForm(NetBoxModelBulkEditForm): diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 1a4cf3a6f..8381316cc 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -9,7 +9,7 @@ from netbox.filtersets import BaseFilterSet, ChangeLoggedModelFilterSet, NetBoxM from tenancy.models import Tenant, TenantGroup from users.models import Group, User from utilities.filters import ( - ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, TreeNodeMultipleChoiceFilter + ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter ) from virtualization.models import Cluster, ClusterGroup, ClusterType from .choices import * @@ -585,16 +585,14 @@ class ConfigContextFilterSet(ChangeLoggedModelFilterSet): queryset=DeviceType.objects.all(), label=_('Device type'), ) - device_role_id = TreeNodeMultipleChoiceFilter( + device_role_id = django_filters.ModelMultipleChoiceFilter( field_name='roles', - lookup_expr='in', queryset=DeviceRole.objects.all(), label=_('Role'), ) - device_role = TreeNodeMultipleChoiceFilter( - field_name='roles', + device_role = django_filters.ModelMultipleChoiceFilter( + field_name='roles__slug', queryset=DeviceRole.objects.all(), - lookup_expr='in', to_field_name='slug', label=_('Role (slug)'), ) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 1691559f9..0a50047fe 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -322,7 +322,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): FieldSet('q', 'filter_id', 'tag_id'), FieldSet('data_source_id', 'data_file_id', name=_('Data')), FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')), - FieldSet('device_type_id', 'platform_id', 'role_id', name=_('Device')), + FieldSet('device_type_id', 'platform_id', 'device_role_id', name=_('Device')), FieldSet('cluster_type_id', 'cluster_group_id', 'cluster_id', name=_('Cluster')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')) ) @@ -364,7 +364,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): required=False, label=_('Device types') ) - role_id = DynamicModelMultipleChoiceField( + device_role_id = DynamicModelMultipleChoiceField( queryset=DeviceRole.objects.all(), required=False, label=_('Roles')