MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Eliot Berriot 2018-10-01 19:51:36 +00:00
parent 8d75d58e82 314765de7c
commit 4e43cb17a2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/music/models.py
View File

@ -41,7 +41,7 @@ class APIModelMixin(models.Model):
mbid = models.UUIDField(unique=True, db_index=True, null=True, blank=True) mbid = models.UUIDField(unique=True, db_index=True, null=True, blank=True)
uuid = models.UUIDField(unique=True, db_index=True, default=uuid.uuid4) uuid = models.UUIDField(unique=True, db_index=True, default=uuid.uuid4)
from_activity = models.ForeignKey( 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 = [] api_includes = []
creation_date = models.DateTimeField(default=timezone.now) creation_date = models.DateTimeField(default=timezone.now)

1
changes/changelog.d/546.enhancement Normal file
View File

@ -0,0 +1 @@
Ensure from_activity field is not required in django's admin (#546)