Commit 4e43cb17 authored by Eliot Berriot's avatar Eliot Berriot

Merge branch '546-blank-from-activity-field' into 'develop'

Resolve "music_album doesn't always need a from_activity_id"

Closes #546

See merge request funkwhale/funkwhale!430
parents 8d75d58e 314765de
......@@ -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)
......
Ensure from_activity field is not required in django's admin (#546)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment