conflict resolution

This commit is contained in:
Sam
2021-02-09 12:06:28 +00:00
9 changed files with 21 additions and 21 deletions

View File

@@ -7,7 +7,6 @@ import datetime
from django.shortcuts import render
from django.http import HttpResponse
from django.contrib.auth import get_user_model
from django.core import serializers
from django.utils.http import urlsafe_base64_decode
from django.utils.encoding import force_text
from django.db import IntegrityError
@@ -151,8 +150,9 @@ def create_company_user(request):
@permission_classes([IsAuthenticated,])
def my_user(request):
qs = User.objects.filter(email=request.user.email)
data = serializers.serialize('json', qs)
return Response(data=data)
user_serializer = core_serializers.CustomUserReadSerializer(qs, many=True)
return Response(data=user_serializer.data)
@api_view(['POST',])
@permission_classes([IsAdminUser,])