diff --git a/user/admin.py b/user/admin.py index 8e14d9d..db3b706 100644 --- a/user/admin.py +++ b/user/admin.py @@ -59,6 +59,19 @@ def export_selected_class_participants(self, request, queryset): 'is_staff' ) + exclude = None + fields = None + + add_fieldsets = ( + ( + None, + { + "classes": ("wide",), + "fields": ("user_name", "password1", "password2"), + }, + ), + ) + # field set fieldsets = ( (None, {'fields': ('email', 'user_name', 'first_name', 'password')}), diff --git a/user/serializers.py b/user/serializers.py index 8b03bb2..bc7bba1 100644 --- a/user/serializers.py +++ b/user/serializers.py @@ -1,6 +1,9 @@ +from copy import deepcopy + from rest_framework import serializers from django.contrib.auth import get_user_model +from rest_framework_simplejwt.serializers import TokenObtainPairSerializer from .models import ( PhoneValidator, @@ -54,6 +57,7 @@ class Meta: class TeamSerialzer(serializers.ModelSerializer): def get_state(self, obj): return obj.get_state_display() + state = serializers.SerializerMethodField() emails = serializers.ListField( write_only=True, child=serializers.EmailField()) @@ -72,7 +76,8 @@ def create(self, validated_data): team = Team.objects.create(**val) team.save() return team - + + class UserSerializerMinimal(serializers.ModelSerializer): class Meta: model = SiteUser