mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
Correct FilterSet naming
This commit is contained in:
@ -15,13 +15,13 @@ from . import serializers
|
|||||||
class UserViewSet(ModelViewSet):
|
class UserViewSet(ModelViewSet):
|
||||||
queryset = RestrictedQuerySet(model=User).prefetch_related('groups')
|
queryset = RestrictedQuerySet(model=User).prefetch_related('groups')
|
||||||
serializer_class = serializers.UserSerializer
|
serializer_class = serializers.UserSerializer
|
||||||
filterset_class = filters.UserFitlerSet
|
filterset_class = filters.UserFilterSet
|
||||||
|
|
||||||
|
|
||||||
class GroupViewSet(ModelViewSet):
|
class GroupViewSet(ModelViewSet):
|
||||||
queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user'))
|
queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user'))
|
||||||
serializer_class = serializers.GroupSerializer
|
serializer_class = serializers.GroupSerializer
|
||||||
filterset_class = filters.GroupFitlerSet
|
filterset_class = filters.GroupFilterSet
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -5,12 +5,12 @@ from django.db.models import Q
|
|||||||
from utilities.filters import BaseFilterSet
|
from utilities.filters import BaseFilterSet
|
||||||
|
|
||||||
__all__ = (
|
__all__ = (
|
||||||
'GroupFitlerSet',
|
'GroupFilterSet',
|
||||||
'UserFitlerSet',
|
'UserFilterSet',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class GroupFitlerSet(BaseFilterSet):
|
class GroupFilterSet(BaseFilterSet):
|
||||||
q = django_filters.CharFilter(
|
q = django_filters.CharFilter(
|
||||||
method='search',
|
method='search',
|
||||||
label='Search',
|
label='Search',
|
||||||
@ -26,7 +26,7 @@ class GroupFitlerSet(BaseFilterSet):
|
|||||||
return queryset.filter(name__icontains=value)
|
return queryset.filter(name__icontains=value)
|
||||||
|
|
||||||
|
|
||||||
class UserFitlerSet(BaseFilterSet):
|
class UserFilterSet(BaseFilterSet):
|
||||||
q = django_filters.CharFilter(
|
q = django_filters.CharFilter(
|
||||||
method='search',
|
method='search',
|
||||||
label='Search',
|
label='Search',
|
||||||
|
Reference in New Issue
Block a user