From 3f4e79f5b2cbb8ceb39c933ef683e29b1a93c666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Fri, 8 Jun 2018 15:00:29 +0200
Subject: [PATCH] allow mailtemplates without language
---
.../web/migrations/0113_auto_20180608_1258.py | 21 +++++++++++++++++++
smash/web/models/mail_template.py | 2 +-
smash/web/views/mails.py | 5 -----
3 files changed, 22 insertions(+), 6 deletions(-)
create mode 100644 smash/web/migrations/0113_auto_20180608_1258.py
diff --git a/smash/web/migrations/0113_auto_20180608_1258.py b/smash/web/migrations/0113_auto_20180608_1258.py
new file mode 100644
index 00000000..17ce6781
--- /dev/null
+++ b/smash/web/migrations/0113_auto_20180608_1258.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-06-08 12:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0112_auto_20180604_1021'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='mailtemplate',
+ name='language',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='web.Language'),
+ ),
+ ]
diff --git a/smash/web/models/mail_template.py b/smash/web/models/mail_template.py
index 2089ae1e..f80b0e55 100644
--- a/smash/web/models/mail_template.py
+++ b/smash/web/models/mail_template.py
@@ -118,7 +118,7 @@ class MailTemplate(models.Model):
name = models.CharField(max_length=255)
context = models.CharField(max_length=1, choices=MAIL_TEMPLATE_CONTEXT_CHOICES)
- language = models.ForeignKey("web.Language", on_delete=models.CASCADE, null=True)
+ language = models.ForeignKey("web.Language", on_delete=models.CASCADE, blank=True, null=True)
template_file = models.FileField(upload_to='templates/')
@staticmethod
diff --git a/smash/web/views/mails.py b/smash/web/views/mails.py
index 32a1f3b0..047e6baf 100644
--- a/smash/web/views/mails.py
+++ b/smash/web/views/mails.py
@@ -50,11 +50,6 @@ class MailTemplatesCreateView(CreateView, WrappedView):
success_url = reverse_lazy('web.views.mail_templates')
success_message = "Template created"
- def get_form(self, form_class=None):
- form = super(MailTemplatesCreateView, self).get_form(form_class)
- form.fields['language'].required = False
- return form
-
class MailTemplatesDeleteView(DeleteView, WrappedView):
model = MailTemplate
--
GitLab