diff --git a/webapp/migrations/0071_auto_20201006_1749.py b/webapp/migrations/0071_auto_20201006_1749.py new file mode 100644 index 0000000..2a3b8fb --- /dev/null +++ b/webapp/migrations/0071_auto_20201006_1749.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.5 on 2020-10-06 14:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0070_auto_20201004_1820'), + ] + + operations = [ + migrations.AlterField( + model_name='signupform', + name='email_content', + field=models.TextField(blank=True), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 8f07330..faf9541 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -100,7 +100,7 @@ class SignupForm(models.Model): schema = JSONField() visible = models.BooleanField(default=True) quota = models.PositiveIntegerField(blank=True, null=True) - email_content = models.TextField() + email_content = models.TextField(blank=True) def __str__(self): return _('#{} {}').format(self.id, self.title) diff --git a/webapp/serializers.py b/webapp/serializers.py index 0a1049e..5192c4c 100644 --- a/webapp/serializers.py +++ b/webapp/serializers.py @@ -53,7 +53,7 @@ class SignupFormSerializer(serializers.ModelSerializer): class Meta: model = SignupForm - fields = ('id', 'title', 'visible', 'isOpen', 'start_time', 'end_time', 'questions', 'schema', 'signups', 'quota') + fields = ('id', 'title', 'visible', 'isOpen', 'start_time', 'end_time', 'email_content', 'questions', 'schema', 'signups', 'quota') class EventSerializer(serializers.ModelSerializer): diff --git a/webapp/templates/signup_email.html b/webapp/templates/signup_email.html index eb3bc9e..1a66b4a 100644 --- a/webapp/templates/signup_email.html +++ b/webapp/templates/signup_email.html @@ -1,12 +1,7 @@ -{% load i18n %} -{% trans "Moikka" %}, - -{% trans "Ilmottautuminen saapui perille" %} - {{ content }} -{% trans "Voit muokata ilmoittautumistasi lomakkeen olleessa avoinna alla olevasta linkistä:" %} +Voit muokata ilmoittautumistasi lomakkeen olleessa avoinna alla olevasta linkistä: {{ url }} -{% trans "Hädässä ota yhteyttä sik-vtmk@list.ayy.fi" %} +Hädässä ota yhteyttä sik-vtmk@list.ayy.fi \ No newline at end of file