Skip to content
Snippets Groups Projects
Commit fd424fe4 authored by Ciarán Ainsworth's avatar Ciarán Ainsworth
Browse files

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
parents 7213d932 70054661
No related branches found
No related tags found
No related merge requests found
Added an album filter to fix problem where channel entries would show up in the wrong series (#1282)
\ No newline at end of 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">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment