From da111d0148bbc545ef21b0a8a9876198d842a9fb Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Tue, 11 Feb 2025 21:52:03 +0330 Subject: [PATCH] account changes --- backend/account/admin.py | 4 ++-- .../0008_rename_birth_day_user_birth_date.py | 18 ++++++++++++++++++ backend/account/models.py | 2 +- backend/account/serializers.py | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 backend/account/migrations/0008_rename_birth_day_user_birth_date.py diff --git a/backend/account/admin.py b/backend/account/admin.py index 3e81445..f0214ab 100644 --- a/backend/account/admin.py +++ b/backend/account/admin.py @@ -30,11 +30,11 @@ class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): list_display = ['full_name_display', 'phone', 'email', 'is_superuser', ] # readonly_fields = ['phone', 'email', 'otp_expiry', 'otp_hash', 'date_joined', 'profile_photo'] - exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login') + exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login', 'gender', 'birth_date') import_form_class = ImportForm export_form_class = ExportForm fieldsets = ( - ('اطلاعات شخصی', {'fields': ('first_name', 'last_name', 'profile_photo', 'password'),}), + ('اطلاعات شخصی', {'fields': ('first_name', 'last_name', 'profile_photo', 'password', 'gender', 'birth_date'),}), ('اطلاعات ارتباطی', {'fields': ('phone', 'email'),}), ) empty_value_display = 'ثبت نشده' diff --git a/backend/account/migrations/0008_rename_birth_day_user_birth_date.py b/backend/account/migrations/0008_rename_birth_day_user_birth_date.py new file mode 100644 index 0000000..b4a4d46 --- /dev/null +++ b/backend/account/migrations/0008_rename_birth_day_user_birth_date.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.2 on 2025-02-11 18:21 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0007_rename_brith_day_user_birth_day'), + ] + + operations = [ + migrations.RenameField( + model_name='user', + old_name='birth_day', + new_name='birth_date', + ), + ] diff --git a/backend/account/models.py b/backend/account/models.py index 4ad25c6..3b32635 100644 --- a/backend/account/models.py +++ b/backend/account/models.py @@ -46,7 +46,7 @@ class User(AbstractBaseUser, PermissionsMixin): ('female', 'زن') ) gender = models.CharField(choices=gender_option, max_length=20, verbose_name='جنسیت') - birth_day = models.DateField() + birth_date = models.DateField() date_joined = models.DateTimeField(auto_now_add=True, verbose_name='تاریخ ثبتنام') otp_hash = models.CharField(max_length=64, null=True, blank=True, verbose_name='کد یک بار مصرف') otp_expiry = models.DateTimeField(null=True, blank=True, verbose_name='تاریخ تمام شدن کد یک بار مصرف') diff --git a/backend/account/serializers.py b/backend/account/serializers.py index 7b6ff1a..0bb0e30 100644 --- a/backend/account/serializers.py +++ b/backend/account/serializers.py @@ -10,7 +10,7 @@ class CustomTokenObtainPairSerializer(TokenObtainPairSerializer): class ProfileSerializer(serializers.ModelSerializer): class Meta: model = User - fields = ['first_name', 'last_name', 'email', 'profile_photo', 'phone', 'gender', 'birth_day'] + fields = ['first_name', 'last_name', 'email', 'profile_photo', 'phone', 'gender', 'birth_date'] read_only_fields = ("phone",)