Merge pull request #106 from hggh/feature/django20

Django 2.0: added on_delete argument

Author: dstegelman

.travis.yml

@@ -1,14 +1,25 @@
 language: python
 
-python:
-  - "2.7"
-  - "3.4"
-
-env:
-  - DJANGO_VERSION=Django==1.8
-  - DJANGO_VERSION=Django==1.9
-  - DJANGO_VERSION=Django==1.10
-  - DJANGO_VERSION=Django==1.11
+matrix:
+  include:
+    - python: 2.7
+      env: DJANGO_VERSION=Django==1.8
+    - python: 2.7
+      env: DJANGO_VERSION=Django==1.9
+    - python: 2.7
+      env: DJANGO_VERSION=Django==1.10
+    - python: 2.7
+      env: DJANGO_VERSION=Django==1.11
+    - python: 3.4
+      env: DJANGO_VERSION=Django==1.8
+    - python: 3.4
+      env: DJANGO_VERSION=Django==1.9
+    - python: 3.4
+      env: DJANGO_VERSION=Django==1.10
+    - python: 3.4
+      env: DJANGO_VERSION=Django==1.11
+    - python: 3.4
+      env: DJANGO_VERSION=Django==2.0
 
 # command to install dependencies
 install:

mailqueue/migrations/0001_initial.py

@@ -50,7 +50,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='attachment',
             name='email',
-            field=models.ForeignKey(blank=True, to='mailqueue.MailerMessage', null=True),
+            field=models.ForeignKey(
+                on_delete=models.deletion.CASCADE,
+                blank=True,
+                to='mailqueue.MailerMessage',
+                null=True,
+            ),
             preserve_default=True,
         ),
     ]

mailqueue/models.py

@@ -143,7 +143,7 @@ class Attachment(models.Model):
     file_attachment = models.FileField(storage=get_storage(), upload_to=upload_to,
                                        blank=True, null=True)
     original_filename = models.CharField(default=None, max_length=250, blank=False)
-    email = models.ForeignKey(MailerMessage, blank=True, null=True)
+    email = models.ForeignKey(MailerMessage, on_delete=models.CASCADE, blank=True, null=True)
 
     class Meta:
         verbose_name = _('Attachment')