From 15df8082aafbebf32c932c4c38b970851492eea8 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 24 Jan 2024 11:07:53 -0600 Subject: [PATCH] More realistic change to resole issue with netboxusers-list --- netbox/users/api/urls.py | 1 + netbox/users/api/views.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/netbox/users/api/urls.py b/netbox/users/api/urls.py index 599d0bb61..2befc9971 100644 --- a/netbox/users/api/urls.py +++ b/netbox/users/api/urls.py @@ -9,6 +9,7 @@ router.APIRootView = views.UsersRootView # Users and groups router.register('users', views.UserViewSet) +router.register('netboxusers', views.NetBoxUserViewSet) router.register('groups', views.GroupViewSet) # Tokens diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py index 62a32c71b..822f274f4 100644 --- a/netbox/users/api/views.py +++ b/netbox/users/api/views.py @@ -5,6 +5,7 @@ from django.contrib.auth.models import Group from django.db.models import Count from drf_spectacular.utils import extend_schema from drf_spectacular.types import OpenApiTypes +from rest_framework.decorators import action from rest_framework.exceptions import AuthenticationFailed from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response @@ -15,7 +16,7 @@ from rest_framework.viewsets import ViewSet from netbox.api.viewsets import NetBoxModelViewSet from users import filtersets -from users.models import ObjectPermission, Token, UserConfig +from users.models import ObjectPermission, Token, UserConfig, NetBoxUser from utilities.querysets import RestrictedQuerySet from utilities.utils import deepmerge from . import serializers @@ -33,6 +34,12 @@ class UsersRootView(APIRootView): # 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): queryset = RestrictedQuerySet(model=get_user_model()).prefetch_related('groups').order_by('username') serializer_class = serializers.UserSerializer