Merge pull request #45 from stueken/master

Set on_delete attribute as required in Django 2.0

Author: ticosax

django_fsm_log/migrations/0001_initial.py

@@ -22,8 +22,8 @@ class Migration(migrations.Migration):
                 ('state', models.CharField(max_length=255, db_index=True)),
                 ('transition', models.CharField(max_length=255)),
                 ('object_id', models.PositiveIntegerField(db_index=True)),
-                ('by', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)),
-                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
+                ('by', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)),
+                ('content_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)),
             ],
             options={
             },

django_fsm_log/models.py

@@ -21,16 +21,17 @@
 @python_2_unicode_compatible
 class StateLog(models.Model):
     timestamp = models.DateTimeField(default=now)
-    by = models.ForeignKey(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), blank=True, null=True)
+    by = models.ForeignKey(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), blank=True,
+                           null=True, on_delete=models.SET_NULL)
     state = models.CharField(max_length=255, db_index=True)
     transition = models.CharField(max_length=255)
 
-    content_type = models.ForeignKey(ContentType)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     object_id = models.PositiveIntegerField(db_index=True)
     content_object = GenericForeignKey('content_type', 'object_id')
 
     objects = StateLogManager()
-    
+
     class Meta:
         get_latest_by = 'timestamp'