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

See #170: included channels in tags view

This commit is contained in:
Eliot Berriot 2020-04-08 13:52:03 +02:00
parent d9d5120be6
commit 2438642867
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
front/src/components/audio/ChannelsWidget.vue
View File

@ -15,12 +15,7 @@
</button> </button>
</template> </template>
<template v-if="!isLoading && objects.length === 0"> <template v-if="!isLoading && objects.length === 0">
<div class="ui placeholder segment"> <empty-state @refresh="fetchData('channels/')" :refresh="true"></empty-state>
<div class="ui icon header">
<i class="compact disc icon"></i>
No results matching your query
</div>
</div>
</template> </template>
</div> </div>
</template> </template>

15
front/src/components/library/TagDetail.vue
View File

@ -14,7 +14,7 @@
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<div class="ui row"> <div class="ui row">
<artist-widget :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}"> <artist-widget :key="id" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id, include_channels: 'false'}">
<template slot="title"> <template slot="title">
<router-link :to="{name: 'library.artists.browse', query: {tag: id}}"> <router-link :to="{name: 'library.artists.browse', query: {tag: id}}">
<translate translate-context="*/*/*/Noun">Artists</translate> <translate translate-context="*/*/*/Noun">Artists</translate>
@ -23,7 +23,13 @@
</artist-widget> </artist-widget>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<album-widget :show-count="true" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}"> <h3 class="ui header">
<translate translate-context="*/*/*">Channels</translate>
</h3>
<channels-widget :key="id" :show-modification-date="true" :filters="{tag: id, ordering: '-creation_date'}"></channels-widget>
<div class="ui hidden divider"></div>
<div class="ui hidden divider"></div>
<album-widget :key="id" :show-count="true" :controls="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<template slot="title"> <template slot="title">
<router-link :to="{name: 'library.albums.browse', query: {tag: id}}"> <router-link :to="{name: 'library.albums.browse', query: {tag: id}}">
<translate translate-context="*/*/*">Albums</translate> <translate translate-context="*/*/*">Albums</translate>
@ -32,7 +38,7 @@
</album-widget> </album-widget>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<track-widget :show-count="true" :limit="12" item-classes="track-item inline" :url="'/tracks/'" :is-activity="false" :filters="{playable: true, ordering: '-creation_date', tag: id}"> <track-widget :key="id" :show-count="true" :limit="12" item-classes="track-item inline" :url="'/tracks/'" :is-activity="false" :filters="{playable: true, ordering: '-creation_date', tag: id}">
<template slot="title"> <template slot="title">
<translate translate-context="*/*/*">Tracks</translate> <translate translate-context="*/*/*">Tracks</translate>
</template> </template>
@ -44,7 +50,7 @@
</template> </template>
<script> <script>
import ChannelsWidget from "@/components/audio/ChannelsWidget"
import TrackWidget from "@/components/audio/track/Widget" import TrackWidget from "@/components/audio/track/Widget"
import AlbumWidget from "@/components/audio/album/Widget" import AlbumWidget from "@/components/audio/album/Widget"
import ArtistWidget from "@/components/audio/artist/Widget" import ArtistWidget from "@/components/audio/artist/Widget"
@ -59,6 +65,7 @@ export default {
AlbumWidget, AlbumWidget,
TrackWidget, TrackWidget,
RadioButton, RadioButton,
ChannelsWidget,
}, },
computed: { computed: {
labels() { labels() {