Skip to content

Fixed user and group filter form name #15103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Fixed user and group filter form name #15103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions netbox/users/forms/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
from utilities.forms.widgets import DateTimePicker

__all__ = (
'GroupFilterForm',
'NetBoxGroupFilterForm',
'ObjectPermissionFilterForm',
'UserFilterForm',
'NetBoxUserFilterForm',
'TokenFilterForm',
)


class GroupFilterForm(NetBoxModelFilterSetForm):
class NetBoxGroupFilterForm(NetBoxModelFilterSetForm):
model = NetBoxGroup
fieldsets = (
(None, ('q', 'filter_id',)),
)


class UserFilterForm(NetBoxModelFilterSetForm):
class NetBoxUserFilterForm(NetBoxModelFilterSetForm):
model = NetBoxUser
fieldsets = (
(None, ('q', 'filter_id',)),
Expand Down
4 changes: 2 additions & 2 deletions netbox/users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class TokenBulkDeleteView(generic.BulkDeleteView):
class UserListView(generic.ObjectListView):
queryset = NetBoxUser.objects.all()
filterset = filtersets.UserFilterSet
filterset_form = forms.UserFilterForm
filterset_form = forms.NetBoxUserFilterForm
table = tables.UserTable


Expand Down Expand Up @@ -112,7 +112,7 @@ class UserBulkDeleteView(generic.BulkDeleteView):
class GroupListView(generic.ObjectListView):
queryset = NetBoxGroup.objects.annotate(users_count=Count('user'))
filterset = filtersets.GroupFilterSet
filterset_form = forms.GroupFilterForm
filterset_form = forms.NetBoxGroupFilterForm
table = tables.GroupTable


Expand Down