Merge branch '660-additionalfield-allow-setting-required-and-help_text' into 'master'

Resolve "[AdditionalField] Allow setting `required` and `help_text`"

Closes #660

See merge request !976

CHANGELOG.rst

@@ -16,6 +16,8 @@ Added
 * Display personal photos instead of avatars based on a site preference.
 * Add an account menu in the top navbar.
 * Create a reusable snippet for avatar content.
+* Allow to configure if additional field is required
+* Allow to configure description of additional fields
 
 Changed
 ~~~~~~~

aleksis/core/migrations/0036_additionalfields_helptext_required.py

+# Generated by Django 3.2.12 on 2022-02-18 21:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0035_preference_model_unique'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='additionalfield',
+            name='help_text',
+            field=models.TextField(blank=True, verbose_name='Help text / description'),
+        ),
+        migrations.AddField(
+            model_name='additionalfield',
+            name='required',
+            field=models.BooleanField(default=False, verbose_name='Required'),
+        ),
+    ]

aleksis/core/models.py

@@ -456,6 +456,8 @@ class AdditionalField(ExtensibleModel):
     field_type = models.CharField(
         verbose_name=_("Type of field"), choices=FIELD_CHOICES, max_length=50
     )
+    required = models.BooleanField(verbose_name=_("Required"), default=False)
+    help_text = models.TextField(verbose_name=_("Help text / description"), blank=True)
 
     def __str__(self) -> str:
         return self.title