From 114a83e304167449cd2974fc6ac488556f7024a2 Mon Sep 17 00:00:00 2001 From: Jannis Portmann Date: Sun, 9 Apr 2023 12:38:05 +0200 Subject: [PATCH] Fix user model --- pflaenzli/pflaenzli/forms.py | 2 +- ...0002_alter_pflaenzliuser_email_and_more.py | 23 +++++++++++++++++++ pflaenzli/pflaenzli/models.py | 3 ++- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pflaenzli/pflaenzli/migrations/0002_alter_pflaenzliuser_email_and_more.py diff --git a/pflaenzli/pflaenzli/forms.py b/pflaenzli/pflaenzli/forms.py index 8386291..7e898c7 100644 --- a/pflaenzli/pflaenzli/forms.py +++ b/pflaenzli/pflaenzli/forms.py @@ -14,6 +14,6 @@ class CreateOfferForm(forms.ModelForm): class RegistrationForm(UserCreationForm): class Meta(UserCreationForm.Meta): model = PflaenzliUser - fields = UserCreationForm.Meta.fields + ('zipcode',) + fields = UserCreationForm.Meta.fields + ('email', 'zipcode',) captcha = FrcCaptchaField() diff --git a/pflaenzli/pflaenzli/migrations/0002_alter_pflaenzliuser_email_and_more.py b/pflaenzli/pflaenzli/migrations/0002_alter_pflaenzliuser_email_and_more.py new file mode 100644 index 0000000..bfa9c01 --- /dev/null +++ b/pflaenzli/pflaenzli/migrations/0002_alter_pflaenzliuser_email_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.7 on 2023-04-09 10:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("pflaenzli", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="pflaenzliuser", + name="email", + field=models.EmailField(max_length=254), + ), + migrations.AlterField( + model_name="pflaenzliuser", + name="zipcode", + field=models.PositiveIntegerField(blank=True, null=True), + ), + ] diff --git a/pflaenzli/pflaenzli/models.py b/pflaenzli/pflaenzli/models.py index daefcd7..9574d46 100644 --- a/pflaenzli/pflaenzli/models.py +++ b/pflaenzli/pflaenzli/models.py @@ -6,7 +6,8 @@ from django.core.files.storage import default_storage class PflaenzliUser(AbstractUser): - zipcode = models.PositiveIntegerField(blank=True) + email = models.EmailField(max_length=254) + zipcode = models.PositiveIntegerField(blank=True, null=True) class Offer(models.Model):