From 314765de7c51d66bf5e3932ca8d09cbfad62600f Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 1 Oct 2018 21:43:33 +0200
Subject: [PATCH] Fix #546: Ensure from_activity field is not required in
django's admin
---
api/funkwhale_api/music/models.py | 2 +-
changes/changelog.d/546.enhancement | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 changes/changelog.d/546.enhancement
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index 4d72d10f..318640c8 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -41,7 +41,7 @@ class APIModelMixin(models.Model):
mbid = models.UUIDField(unique=True, db_index=True, null=True, blank=True)
uuid = models.UUIDField(unique=True, db_index=True, default=uuid.uuid4)
from_activity = models.ForeignKey(
- "federation.Activity", null=True, on_delete=models.SET_NULL
+ "federation.Activity", null=True, blank=True, on_delete=models.SET_NULL
)
api_includes = []
creation_date = models.DateTimeField(default=timezone.now)
diff --git a/changes/changelog.d/546.enhancement b/changes/changelog.d/546.enhancement
new file mode 100644
index 00000000..9b5c20c7
--- /dev/null
+++ b/changes/changelog.d/546.enhancement
@@ -0,0 +1 @@
+Ensure from_activity field is not required in django's admin (#546)
--
GitLab