NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 21:18:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "More realistic change to resole issue with netboxusers-list"

Browse Source 
This reverts commit 15df8082aa.
This commit is contained in:
Daniel Sheppard 2024-01-26 15:26:49 -06:00
parent 15df8082aa
commit 979b71446d
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/users/api/urls.py
View File

@ -9,7 +9,6 @@ router.APIRootView = views.UsersRootView
# Users and groups # Users and groups
router.register('users', views.UserViewSet) router.register('users', views.UserViewSet)
router.register('netboxusers', views.NetBoxUserViewSet)
router.register('groups', views.GroupViewSet) router.register('groups', views.GroupViewSet)
# Tokens # Tokens

9
netbox/users/api/views.py
View File

@ -5,7 +5,6 @@ from django.contrib.auth.models import Group
from django.db.models import Count from django.db.models import Count
from drf_spectacular.utils import extend_schema from drf_spectacular.utils import extend_schema
from drf_spectacular.types import OpenApiTypes from drf_spectacular.types import OpenApiTypes
from rest_framework.decorators import action
from rest_framework.exceptions import AuthenticationFailed from rest_framework.exceptions import AuthenticationFailed
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response from rest_framework.response import Response
@ -16,7 +15,7 @@ from rest_framework.viewsets import ViewSet
from netbox.api.viewsets import NetBoxModelViewSet from netbox.api.viewsets import NetBoxModelViewSet
from users import filtersets from users import filtersets
from users.models import ObjectPermission, Token, UserConfig, NetBoxUser from users.models import ObjectPermission, Token, UserConfig
from utilities.querysets import RestrictedQuerySet from utilities.querysets import RestrictedQuerySet
from utilities.utils import deepmerge from utilities.utils import deepmerge
from . import serializers from . import serializers
@ -34,12 +33,6 @@ class UsersRootView(APIRootView):
# Users and groups # Users and groups
# #
class NetBoxUserViewSet(NetBoxModelViewSet):
queryset = RestrictedQuerySet(model=NetBoxUser).prefetch_related('groups').order_by('username')
serializer_class = serializers.UserSerializer
filterset_class = filtersets.UserFilterSet
class UserViewSet(NetBoxModelViewSet): class UserViewSet(NetBoxModelViewSet):
queryset = RestrictedQuerySet(model=get_user_model()).prefetch_related('groups').order_by('username') queryset = RestrictedQuerySet(model=get_user_model()).prefetch_related('groups').order_by('username')
serializer_class = serializers.UserSerializer serializer_class = serializers.UserSerializer