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
This commit is contained in:
commit
4e43cb17a2
|
@ -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)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Ensure from_activity field is not required in django's admin (#546)
|
Loading…
Reference in New Issue