phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
Anatoly 2019-09-09 17:12:03 +03:00
parent 64b101516d
commit 89830ffdac
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/account/models.py
View File

@ -181,13 +181,6 @@ class User(ImageMixin, AbstractUser):
'domain_uri': settings.DOMAIN_URI, 'domain_uri': settings.DOMAIN_URI,
'site_name': settings.SITE_NAME}) 'site_name': settings.SITE_NAME})
@property
def fullname(self):
fullname = []
if self.first_name: fullname.append(self.first_name)
if self.last_name: fullname.append(self.last_name)
return ' '.join(fullname)
class ResetPasswordTokenQuerySet(models.QuerySet): class ResetPasswordTokenQuerySet(models.QuerySet):
"""Reset password token query set""" """Reset password token query set"""

6
apps/account/serializers/common.py
View File

@ -14,7 +14,7 @@ class UserSerializer(serializers.ModelSerializer):
"""User serializer.""" """User serializer."""
# RESPONSE # RESPONSE
email_confirmed = serializers.BooleanField(read_only=True) email_confirmed = serializers.BooleanField(read_only=True)
fullname = serializers.SerializerMethodField() fullname = serializers.CharField(source='get_full_name')
# REQUEST # REQUEST
username = serializers.CharField(required=False) username = serializers.CharField(required=False)
@ -39,10 +39,6 @@ class UserSerializer(serializers.ModelSerializer):
'newsletter', 'newsletter',
] ]
def get_fullname(self, obj):
"""Get user full name"""
return obj.fullname
def validate_email(self, value): def validate_email(self, value):
"""Validate email value""" """Validate email value"""
if value == self.instance.email: if value == self.instance.email: