Signup email and other model fields

webapp/migrations/0070_auto_20201004_1820.py

@@ -0,0 +1,39 @@
+# Generated by Django 2.1.5 on 2020-10-04 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0069_signupform_schema'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='location_en',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='location_fi',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='signupform',
+            name='email_content',
+            field=models.TextField(default=''),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='signupform',
+            name='title_en',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='signupform',
+            name='title_fi',
+            field=models.CharField(max_length=255, null=True),
+        ),
+    ]

webapp/models.py

@@ -100,6 +100,7 @@ class SignupForm(models.Model):
     schema = JSONField()
     visible = models.BooleanField(default=True)
     quota = models.PositiveIntegerField(blank=True, null=True)
+    email_content = models.TextField()
 
     def __str__(self):
         return _('#{} {}').format(self.id, self.title)
@@ -149,7 +150,7 @@ def email_on_signup(sender, instance, created, **kwargs):
         except AttributeError:
             # subject = _(f"Olet ilmoittautunut ilmoon {instance.signupForm.title}")
             subject = f"Olet ilmoittautunut ilmoon {instance.signupForm.title}"
-        send_signup_email(instance.email, subject, instance.id, instance.uuid)
+        send_signup_email(instance.email, subject, instance.id, instance.uuid, instance.signupForm.email_content)
 
 
 class BaseRole(models.Model):

webapp/templates/signup_email.html

@@ -3,6 +3,8 @@
 
 {% trans "Ilmottautuminen saapui perille" %}
 
+{{ content }}
+
 {% trans "Voit muokata ilmoittautumistasi lomakkeen olleessa avoinna alla olevasta linkistä:" %}
 
 {{ url }}

webapp/translation.py

@@ -29,7 +29,7 @@ class TagTranslationOptions(TranslationOptions):
 class EventTranslationOptions(TranslationOptions):
     """Class for event translation options."""
 
-    fields = ()
+    fields = ('location',)
 
 
 @register(Signup)
@@ -43,7 +43,7 @@ class SignupTranslationOptions(TranslationOptions):
 class SignupFormTranslationOptions(TranslationOptions):
     """Class for registration translation options."""
 
-    fields = ()
+    fields = ('title',)
 
 
 @register(TemplateQuestion)

webapp/utils.py

@@ -91,10 +91,11 @@ def send_email(to, subject, body, html=False):
         logging.exception('Failed to send email.')
 
 
-def send_signup_email(to, subject, id, uuid):
+def send_signup_email(to, subject, id, uuid, content):
     message = render_to_string(
         'webapp:signup_email.html', {
             'url': f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}",
+            'content': content,
         }
     )