Rajoute le nom complet
This commit is contained in:
parent
40762af938
commit
b44f150cf9
4 changed files with 26 additions and 2 deletions
20
elections/migrations/0005_user_full_name.py
Normal file
20
elections/migrations/0005_user_full_name.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Generated by Django 2.2.17 on 2020-12-23 17:03
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("elections", "0004_auto_20201220_1847"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="user",
|
||||||
|
name="full_name",
|
||||||
|
field=models.CharField(
|
||||||
|
blank=True, max_length=150, verbose_name="Nom et Prénom"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
|
@ -87,6 +87,7 @@ class User(AbstractUser):
|
||||||
blank=True,
|
blank=True,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
)
|
)
|
||||||
|
full_name = models.CharField(_("Nom et Prénom"), max_length=150, blank=True)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def base_username(self):
|
def base_username(self):
|
||||||
|
|
|
@ -15,7 +15,7 @@ def create_users(election, csv_file):
|
||||||
reader = csv.reader(io.StringIO(csv_file.read().decode("utf-8")), dialect)
|
reader = csv.reader(io.StringIO(csv_file.read().decode("utf-8")), dialect)
|
||||||
for (username, full_name, email) in reader:
|
for (username, full_name, email) in reader:
|
||||||
election.registered_voters.create(
|
election.registered_voters.create(
|
||||||
username=f"{election.id}__{username}", email=email
|
username=f"{election.id}__{username}", email=email, full_name=full_name
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ class ENSCASBackend:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
email = attributes.get("email")
|
email = attributes.get("email")
|
||||||
|
name = attributes.get("name")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
user = UserModel.objects.get(username=cas_login)
|
user = UserModel.objects.get(username=cas_login)
|
||||||
|
@ -44,7 +45,9 @@ class ENSCASBackend:
|
||||||
user = None
|
user = None
|
||||||
|
|
||||||
if user is None:
|
if user is None:
|
||||||
user = UserModel.objects.create_user(username=cas_login, email=email)
|
user = UserModel.objects.create_user(
|
||||||
|
username=cas_login, email=email, full_name=name
|
||||||
|
)
|
||||||
return user
|
return user
|
||||||
|
|
||||||
# Django boilerplate.
|
# Django boilerplate.
|
||||||
|
|
Loading…
Reference in a new issue