Merge branch 'gender_options' into 'master'

Fix pronouns field being mandatory

See merge request ae/Sith!288
This commit is contained in:
Ailé 2021-11-18 09:07:21 +00:00
commit 5b2c70e4fb
2 changed files with 6 additions and 6 deletions

View File

@ -5,14 +5,14 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [("core", "0036_auto_20211001_0248")]
("core", "0036_auto_20211001_0248"),
]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name="user", model_name="user",
name="pronouns", name="pronouns",
field=models.CharField(default="", max_length=64, verbose_name="pronouns"), field=models.CharField(
blank=True, default="", max_length=64, verbose_name="pronouns"
), ),
)
] ]

View File

@ -229,7 +229,7 @@ class User(AbstractBaseUser):
blank=True, blank=True,
choices=[("MAN", _("Man")), ("WOMAN", _("Woman")), ("OTHER", _("Other"))], choices=[("MAN", _("Man")), ("WOMAN", _("Woman")), ("OTHER", _("Other"))],
) )
pronouns = models.CharField(_("pronouns"), max_length=64, default="") pronouns = models.CharField(_("pronouns"), max_length=64, blank=True, default="")
tshirt_size = models.CharField( tshirt_size = models.CharField(
_("tshirt size"), _("tshirt size"),
max_length=5, max_length=5,