diff --git a/netbox/users/forms/filtersets.py b/netbox/users/forms/filtersets.py index 0746b42a3..136fd8c70 100644 --- a/netbox/users/forms/filtersets.py +++ b/netbox/users/forms/filtersets.py @@ -23,18 +23,8 @@ class UserFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): model = NetBoxUser fieldsets = ( (None, ('q', 'filter_id',)), - ('Name', ('username', 'first_name', 'last_name')), ('Security', ('is_superuser', 'is_staff', 'is_active')), ) - username = forms.CharField( - required=False - ) - first_name = forms.CharField( - required=False - ) - last_name = forms.CharField( - required=False - ) is_superuser = forms.NullBooleanField( required=False, widget=forms.Select( @@ -62,10 +52,6 @@ class GroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm): model = NetBoxUser fieldsets = ( (None, ('q', 'filter_id',)), - ('Name', ('name',)), - ) - name = forms.CharField( - required=False ) @@ -73,7 +59,7 @@ class ObjectPermissionFilterForm(ContactModelFilterForm, NetBoxModelFilterSetFor model = NetBoxUser fieldsets = ( (None, ('q', 'filter_id',)), - ('Name', ('enabled',)), + (None, ('enabled',)), ) enabled = forms.NullBooleanField( required=False, diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py index 1d7133d2a..f35c56cb4 100644 --- a/netbox/users/forms/model_forms.py +++ b/netbox/users/forms/model_forms.py @@ -198,7 +198,10 @@ class GroupForm(BootstrapMixin, forms.ModelForm): class ObjectPermissionForm(BootstrapMixin, forms.ModelForm): - actions = forms.CharField(required=False) + actions = SimpleArrayField( + base_field=forms.CharField(), + required=False, + ) users = DynamicModelMultipleChoiceField( required=False, queryset=get_user_model().objects.all()