From 0a23318e8c0fa7f82fb31b34b7de2c06f0b185f3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Feb 2024 10:30:39 -0500 Subject: [PATCH] Remove obsolete value-field attr on dynamic select widgets --- netbox/users/forms/model_forms.py | 6 ++---- netbox/utilities/forms/fields/dynamic.py | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py index 11874e929..d759dd2ac 100644 --- a/netbox/users/forms/model_forms.py +++ b/netbox/users/forms/model_forms.py @@ -186,8 +186,7 @@ class UserForm(forms.ModelForm): object_permissions = DynamicModelMultipleChoiceField( required=False, label=_('Permissions'), - queryset=ObjectPermission.objects.all(), - to_field_name='pk', + queryset=ObjectPermission.objects.all() ) fieldsets = ( @@ -244,8 +243,7 @@ class GroupForm(forms.ModelForm): object_permissions = DynamicModelMultipleChoiceField( required=False, label=_('Permissions'), - queryset=ObjectPermission.objects.all(), - to_field_name='pk', + queryset=ObjectPermission.objects.all() ) fieldsets = ( diff --git a/netbox/utilities/forms/fields/dynamic.py b/netbox/utilities/forms/fields/dynamic.py index 00a1f823e..797ee865c 100644 --- a/netbox/utilities/forms/fields/dynamic.py +++ b/netbox/utilities/forms/fields/dynamic.py @@ -92,9 +92,6 @@ class DynamicModelChoiceMixin: self.fetch_trigger = fetch_trigger self.selector = selector - # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference - # by widget_attrs() - self.to_field_name = kwargs.get('to_field_name') self.empty_option = empty_label or "" super().__init__(queryset, **kwargs) @@ -104,10 +101,6 @@ class DynamicModelChoiceMixin: 'data-empty-option': self.empty_option } - # Set value-field attribute if the field specifies to_field_name - if self.to_field_name: - attrs['value-field'] = self.to_field_name - # Set the string used to represent a null option if self.null_option is not None: attrs['data-null-option'] = self.null_option