NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 16:56:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

12589 UI fixes

Browse Source
This commit is contained in:
Arthur 2023-06-12 13:10:14 -07:00
parent 78ef1d1412
commit 3ed852f88a
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/users/forms/filtersets.py
View File

@ -23,18 +23,8 @@ class UserFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
model = NetBoxUser model = NetBoxUser
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),
('Name', ('username', 'first_name', 'last_name')),
('Security', ('is_superuser', 'is_staff', 'is_active')), ('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( is_superuser = forms.NullBooleanField(
required=False, required=False,
widget=forms.Select( widget=forms.Select(
@ -62,10 +52,6 @@ class GroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
model = NetBoxUser model = NetBoxUser
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),
('Name', ('name',)),
)
name = forms.CharField(
required=False
) )
@ -73,7 +59,7 @@ class ObjectPermissionFilterForm(ContactModelFilterForm, NetBoxModelFilterSetFor
model = NetBoxUser model = NetBoxUser
fieldsets = ( fieldsets = (
(None, ('q', 'filter_id',)), (None, ('q', 'filter_id',)),
('Name', ('enabled',)), (None, ('enabled',)),
) )
enabled = forms.NullBooleanField( enabled = forms.NullBooleanField(
required=False, required=False,

5
netbox/users/forms/model_forms.py
View File

@ -198,7 +198,10 @@ class GroupForm(BootstrapMixin, forms.ModelForm):
class ObjectPermissionForm(BootstrapMixin, forms.ModelForm): class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
actions = forms.CharField(required=False) actions = SimpleArrayField(
base_field=forms.CharField(),
required=False,
)
users = DynamicModelMultipleChoiceField( users = DynamicModelMultipleChoiceField(
required=False, required=False,
queryset=get_user_model().objects.all() queryset=get_user_model().objects.all()