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

Merge branch '1282-channel-album-detail-view-includes-tracks-from-other-albums' into 'develop' 

Resolve "Channel album detail view includes tracks from other albums"

Closes #1282

See merge request funkwhale/funkwhale!1255
This commit is contained in:
Ciarán Ainsworth 2020-12-04 11:52:50 +01:00
parent 7213d9327c 70054661c7
commit fd424fe47d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1282.bugfix Normal file
View File

@ -0,0 +1 @@
Added an album filter to fix problem where channel entries would show up in the wrong series (#1282)

2
front/src/components/library/AlbumDetail.vue
View File

@ -4,7 +4,7 @@
<translate key="1" v-if="isSerie" translate-context="Content/Channels/*">Episodes</translate>
<translate key="2" v-else translate-context="*/*/*">Tracks</translate>
</h2>
<channel-entries v-if="artist.channel && isSerie" :limit="50" :filters="{channel: artist.channel.uuid, ordering: '-creation_date'}">
<channel-entries v-if="artist.channel && isSerie" :limit="50" :filters="{channel: artist.channel.uuid, album: object.id, ordering: '-creation_date'}">
</channel-entries>
<template v-else-if="discs && discs.length > 1">
<div v-for="tracks in discs" :key="tracks.disc_number">