MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[web] Simplify naming to avoid confusion

This commit is contained in:
Alain Nussbaumer 2024-04-26 18:10:23 +02:00
parent 73040780b9
commit 0401fb9616
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web-src/src/pages/PageAlbums.vue
View File

@ -41,8 +41,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.albums.sort.title')" /> <p class="heading mb-5" v-text="$t('page.albums.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -101,7 +101,7 @@ export default {
data() { data() {
return { return {
albums_list: new GroupedList(), albums_list: new GroupedList(),
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.albums.sort.name'), name: this.$t('page.albums.sort.name'),
@ -151,8 +151,8 @@ export default {
computed: { computed: {
albums() { albums() {
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
grouping.options.filters = [ grouping.options.filters = [
(album) => !this.hide_singles || album.track_count > 2, (album) => !this.hide_singles || album.track_count > 2,
@ -178,7 +178,7 @@ export default {
this.$store.commit(types.HIDE_SPOTIFY, value) this.$store.commit(types.HIDE_SPOTIFY, value)
} }
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.albums_sort return this.$store.state.albums_sort
}, },

12
web-src/src/pages/PageArtist.vue
View File

@ -24,8 +24,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.artist.sort.title')" /> <p class="heading mb-5" v-text="$t('page.artist.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -112,7 +112,7 @@ export default {
return { return {
albums_list: new GroupedList(), albums_list: new GroupedList(),
artist: {}, artist: {},
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.artist.sort.name'), name: this.$t('page.artist.sort.name'),
@ -130,8 +130,8 @@ export default {
computed: { computed: {
albums() { albums() {
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
grouping.options.filters = [ grouping.options.filters = [
(album) => !this.hide_spotify || album.data_kind !== 'spotify' (album) => !this.hide_spotify || album.data_kind !== 'spotify'
@ -147,7 +147,7 @@ export default {
this.$store.commit(types.HIDE_SPOTIFY, value) this.$store.commit(types.HIDE_SPOTIFY, value)
} }
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.artist_albums_sort return this.$store.state.artist_albums_sort
}, },

12
web-src/src/pages/PageArtistTracks.vue
View File

@ -25,8 +25,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.artist.sort.title')" /> <p class="heading mb-5" v-text="$t('page.artist.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -114,7 +114,7 @@ export default {
data() { data() {
return { return {
artist: {}, artist: {},
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.artist.sort.name'), name: this.$t('page.artist.sort.name'),
@ -150,7 +150,7 @@ export default {
this.$store.commit(types.HIDE_SPOTIFY, value) this.$store.commit(types.HIDE_SPOTIFY, value)
} }
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.artist_tracks_sort return this.$store.state.artist_tracks_sort
}, },
@ -165,8 +165,8 @@ export default {
return this.tracks_list.items.map((item) => item.uri).join() return this.tracks_list.items.map((item) => item.uri).join()
}, },
tracks() { tracks() {
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
grouping.options.filters = [ grouping.options.filters = [
(track) => !this.hide_spotify || track.data_kind !== 'spotify' (track) => !this.hide_spotify || track.data_kind !== 'spotify'

12
web-src/src/pages/PageArtists.vue
View File

@ -41,8 +41,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.artists.sort.title')" /> <p class="heading mb-5" v-text="$t('page.artists.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -101,7 +101,7 @@ export default {
data() { data() {
return { return {
artists_list: new GroupedList(), artists_list: new GroupedList(),
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.artists.sort.name'), name: this.$t('page.artists.sort.name'),
@ -125,8 +125,8 @@ export default {
if (!this.artists_list) { if (!this.artists_list) {
return [] return []
} }
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
grouping.options.filters = [ grouping.options.filters = [
(artist) => (artist) =>
@ -152,7 +152,7 @@ export default {
this.$store.commit(types.HIDE_SPOTIFY, value) this.$store.commit(types.HIDE_SPOTIFY, value)
} }
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.artists_sort return this.$store.state.artists_sort
}, },

12
web-src/src/pages/PageComposerTracks.vue
View File

@ -7,8 +7,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.artist.sort.title')" /> <p class="heading mb-5" v-text="$t('page.artist.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -102,7 +102,7 @@ export default {
data() { data() {
return { return {
composer: {}, composer: {},
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.composer.sort.name'), name: this.$t('page.composer.sort.name'),
@ -126,7 +126,7 @@ export default {
expression() { expression() {
return `composer is "${this.composer.name}" and media_kind is music` return `composer is "${this.composer.name}" and media_kind is music`
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.composer_tracks_sort return this.$store.state.composer_tracks_sort
}, },
@ -135,8 +135,8 @@ export default {
} }
}, },
tracks() { tracks() {
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
this.tracks_list.group(grouping.options) this.tracks_list.group(grouping.options)
return this.tracks_list return this.tracks_list

12
web-src/src/pages/PageGenreTracks.vue
View File

@ -7,8 +7,8 @@
<div class="column"> <div class="column">
<p class="heading mb-5" v-text="$t('page.genre.sort.title')" /> <p class="heading mb-5" v-text="$t('page.genre.sort.title')" />
<control-dropdown <control-dropdown
v-model:value="selected_grouping_option_id" v-model:value="selected_grouping_id"
:options="grouping_options" :options="groupings"
/> />
</div> </div>
</div> </div>
@ -97,7 +97,7 @@ export default {
data() { data() {
return { return {
genre: {}, genre: {},
grouping_options: [ groupings: [
{ {
id: 1, id: 1,
name: this.$t('page.genre.sort.name'), name: this.$t('page.genre.sort.name'),
@ -122,7 +122,7 @@ export default {
expression() { expression() {
return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}` return `genre is "${this.genre.name}" and media_kind is ${this.media_kind}`
}, },
selected_grouping_option_id: { selected_grouping_id: {
get() { get() {
return this.$store.state.genre_tracks_sort return this.$store.state.genre_tracks_sort
}, },
@ -131,8 +131,8 @@ export default {
} }
}, },
tracks() { tracks() {
const grouping = this.grouping_options.find( const grouping = this.groupings.find(
(o) => o.id === this.selected_grouping_option_id (grouping) => grouping.id === this.selected_grouping_id
) )
this.tracks_list.group(grouping.options) this.tracks_list.group(grouping.options)
return this.tracks_list return this.tracks_list