From 0f91587c60d982bf35ef69bbd5061c2ab88e2d91 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 16 Apr 2023 13:50:01 +0200 Subject: [PATCH] Remove unneeded users API view The help-users API view is sufficient --- gnuviechadmin/gnuviechadmin/urls.py | 1 - gnuviechadmin/help/serializers.py | 12 ++---------- gnuviechadmin/help/views.py | 18 ++---------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/gnuviechadmin/gnuviechadmin/urls.py b/gnuviechadmin/gnuviechadmin/urls.py index 34a7d7c..046d1fb 100644 --- a/gnuviechadmin/gnuviechadmin/urls.py +++ b/gnuviechadmin/gnuviechadmin/urls.py @@ -13,7 +13,6 @@ from help import views as help_views admin.autodiscover() router = routers.DefaultRouter() -router.register(r"users", help_views.UserViewSet) router.register(r"help-users", help_views.HelpUserViewSet) urlpatterns = [ diff --git a/gnuviechadmin/help/serializers.py b/gnuviechadmin/help/serializers.py index 2052926..f4beec2 100644 --- a/gnuviechadmin/help/serializers.py +++ b/gnuviechadmin/help/serializers.py @@ -2,22 +2,14 @@ Serializers for the REST API """ -from django.contrib.auth import get_user_model from rest_framework import serializers from help.models import HelpUser -User = get_user_model() - - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ["url", "username", "helpuser"] - read_only_fields = ["username", "helpuser"] - class HelpUserSerializer(serializers.HyperlinkedModelSerializer): + user = serializers.StringRelatedField() + class Meta: model = HelpUser fields = [ diff --git a/gnuviechadmin/help/views.py b/gnuviechadmin/help/views.py index cdfcff6..8e81193 100644 --- a/gnuviechadmin/help/views.py +++ b/gnuviechadmin/help/views.py @@ -1,21 +1,7 @@ -from django.contrib.auth import get_user_model from rest_framework import permissions, viewsets from help.models import HelpUser -from help.serializers import HelpUserSerializer, UserSerializer - -User = get_user_model() - - -class UserViewSet(viewsets.ReadOnlyModelViewSet): - """ - API endpoint that allows users to be viewed or edited. - - """ - - queryset = User.objects.all().order_by("-username") - serializer_class = UserSerializer - permission_classes = [permissions.IsAdminUser] +from help.serializers import HelpUserSerializer class HelpUserViewSet(viewsets.ModelViewSet): @@ -24,6 +10,6 @@ class HelpUserViewSet(viewsets.ModelViewSet): """ - queryset = HelpUser.objects.all().order_by("-user__username") + queryset = HelpUser.objects.all().order_by("user__username") serializer_class = HelpUserSerializer permission_classes = [permissions.IsAdminUser]