Merge pull request #1131 from Naggafin/main

changed UserSerializer to utilize custom user classes (didn't work wi…
This commit is contained in:
Christopher Broderick 2023-11-09 19:21:29 +00:00 committed by GitHub
commit 9ed5ecf327
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@ from .forms import TicketForm
from .lib import format_time_spent, process_attachments from .lib import format_time_spent, process_attachments
from .models import CustomField, FollowUp, FollowUpAttachment, Ticket from .models import CustomField, FollowUp, FollowUpAttachment, Ticket
from .user import HelpdeskUser from .user import HelpdeskUser
from django.contrib.auth.models import User from django.contrib.auth import get_user_model
from django.contrib.humanize.templatetags import humanize from django.contrib.humanize.templatetags import humanize
from rest_framework import serializers from rest_framework import serializers
from rest_framework.exceptions import ValidationError from rest_framework.exceptions import ValidationError
@ -152,7 +152,7 @@ class UserSerializer(serializers.ModelSerializer):
password = serializers.CharField(write_only=True) password = serializers.CharField(write_only=True)
class Meta: class Meta:
model = User model = get_user_model()
fields = ('first_name', 'last_name', 'username', 'email', 'password') fields = ('first_name', 'last_name', 'username', 'email', 'password')
def create(self, validated_data): def create(self, validated_data):