Skip to content
Snippets Groups Projects
Commit bfbd4c07 authored by florimondmanca's avatar florimondmanca
Browse files

release required constraints on user first name, last name and dob

parent 3b2ed5aa
Branches
No related tags found
No related merge requests found
......@@ -47,15 +47,14 @@ class UserModelTest(ModelTestCase):
},
'date_of_birth': {
'verbose_name': 'date de naissance',
'blank': False,
'blank': True,
'null': True,
},
'gender': {
'verbose_name': 'sexe',
'max_length': 1,
'default': User.MALE,
'choices': (('M', 'Homme'), ('F', 'Femme')),
'blank': False,
'blank': True,
},
'phone_number': {
'verbose_name': 'téléphone',
......
# Generated by Django 2.0.3 on 2018-04-09 22:11
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='user',
name='date_of_birth',
field=models.DateField(blank=True, null=True, verbose_name='date de naissance'),
),
migrations.AlterField(
model_name='user',
name='gender',
field=models.CharField(blank=True, choices=[('M', 'Homme'), ('F', 'Femme')], max_length=1, null=True, verbose_name='sexe'),
),
]
# Generated by Django 2.0.3 on 2018-04-09 22:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0002_auto_20180410_0011'),
]
operations = [
migrations.AlterField(
model_name='user',
name='first_name',
field=models.CharField(blank=True, max_length=30, verbose_name='first name'),
),
migrations.AlterField(
model_name='user',
name='last_name',
field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
),
]
......@@ -51,8 +51,6 @@ class UserManager(_UserManager):
@modify_fields(
username={'blank': True, '_unique': False, 'null': True},
email={'_unique': True, 'blank': False, 'null': False},
first_name={'blank': False},
last_name={'blank': False},
)
class User(AbstractUser):
"""Custom user.
......@@ -71,10 +69,13 @@ class User(AbstractUser):
"""
USERNAME_FIELD = 'email' # default was: username
# v List of fields prompted when creating a superuser
REQUIRED_FIELDS = ['first_name', 'last_name'] # removed email
objects = UserManager()
date_of_birth = models.DateField(blank=False, null=True,
date_of_birth = models.DateField(blank=True, null=True,
verbose_name='date de naissance')
MALE = 'M'
......@@ -83,9 +84,8 @@ class User(AbstractUser):
(MALE, 'Homme'),
(FEMALE, 'Femme'),
)
gender = models.CharField('sexe',
max_length=1, choices=GENDER_CHOICES,
default=MALE)
gender = models.CharField('sexe', blank=True, null=True,
max_length=1, choices=GENDER_CHOICES)
# TODO add a proper phone number validator
phone_number = models.CharField('téléphone',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment