Bring in changes from @mattlindesay

From #22 Copying in rather than dealing with merge because of the JSONField and migrations changes
pinax · Aug 15, 2020 · 730c4b7 · 730c4b7
1 parent 39a8151
commit 730c4b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pinax/eventlog/migrations/0001_initial.py b/pinax/eventlog/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1 on 2020-08-15 09:54
+# Generated by Django 3.1 on 2020-08-15 10:08
 
 from django.conf import settings
 import django.core.serializers.json
@@ -23,9 +23,9 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('timestamp', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
                 ('action', models.CharField(db_index=True, max_length=50)),
-                ('object_id', models.PositiveIntegerField(null=True)),
-                ('extra', models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder)),
-                ('content_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='contenttypes.contenttype')),
+                ('object_id', models.PositiveIntegerField(blank=True, null=True)),
+                ('extra', models.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder)),
+                ('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contenttypes.contenttype')),
                 ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
             ],
             options={

diff --git a/pinax/eventlog/models.py b/pinax/eventlog/models.py
@@ -17,10 +17,10 @@ class Log(models.Model):
     )
     timestamp = models.DateTimeField(default=timezone.now, db_index=True)
     action = models.CharField(max_length=50, db_index=True)
-    content_type = models.ForeignKey(ContentType, null=True, on_delete=models.SET_NULL)
-    object_id = models.PositiveIntegerField(null=True)
+    content_type = models.ForeignKey(ContentType, null=True, on_delete=models.SET_NULL, blank=True)
+    object_id = models.PositiveIntegerField(null=True, blank=True)
     obj = GenericForeignKey("content_type", "object_id")
-    extra = models.JSONField(encoder=DjangoJSONEncoder)
+    extra = models.JSONField(encoder=DjangoJSONEncoder, blank=True)
 
     @property
     def template_fragment_name(self):