-
+
Album artist
{{ album.artist }}
-
- Album artist
- {{ album.artist }}
-
Release date
{{ album.date_released | time('L') }}
@@ -90,6 +86,10 @@ export default {
computed: {
artwork_url: function () {
return webapi.artwork_url_append_size_params(this.album.artwork_url)
+ },
+
+ media_kind_resolved: function () {
+ return this.media_kind ? this.media_kind : this.album.media_kind
}
},
@@ -110,9 +110,9 @@ export default {
},
open_album: function () {
- if (this.media_kind === 'podcast') {
+ if (this.media_kind_resolved === 'podcast') {
this.$router.push({ path: '/podcasts/' + this.album.id })
- } else if (this.media_kind === 'audiobook') {
+ } else if (this.media_kind_resolved === 'audiobook') {
this.$router.push({ path: '/audiobooks/' + this.album.id })
} else {
this.$router.push({ path: '/music/albums/' + this.album.id })
@@ -120,7 +120,13 @@ export default {
},
open_artist: function () {
- this.$router.push({ path: '/music/artists/' + this.album.artist_id })
+ if (this.media_kind_resolved === 'podcast') {
+ // No artist page for podcasts
+ } else if (this.media_kind_resolved === 'audiobook') {
+ this.$router.push({ path: '/audiobooks/artists/' + this.album.artist_id })
+ } else {
+ this.$router.push({ path: '/music/artists/' + this.album.artist_id })
+ }
},
mark_played: function () {
diff --git a/web-src/src/pages/PageAlbums.vue b/web-src/src/pages/PageAlbums.vue
index 339f37a5..e887dda4 100644
--- a/web-src/src/pages/PageAlbums.vue
+++ b/web-src/src/pages/PageAlbums.vue
@@ -19,27 +19,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -50,9 +30,7 @@ import { LoadDataBeforeEnterMixin } from './mixin'
import ContentWithHeading from '@/templates/ContentWithHeading'
import TabsMusic from '@/components/TabsMusic'
import IndexButtonList from '@/components/IndexButtonList'
-import ListItemAlbum from '@/components/ListItemAlbum'
-import ModalDialogAlbum from '@/components/ModalDialogAlbum'
-import CoverArtwork from '@/components/CoverArtwork'
+import ListAlbums from '@/components/ListAlbums'
import webapi from '@/webapi'
import * as types from '@/store/mutation_types'
@@ -72,15 +50,12 @@ const albumsData = {
export default {
name: 'PageAlbums',
mixins: [LoadDataBeforeEnterMixin(albumsData)],
- components: { ContentWithHeading, TabsMusic, IndexButtonList, ListItemAlbum, ModalDialogAlbum, CoverArtwork },
+ components: { ContentWithHeading, TabsMusic, IndexButtonList, ListAlbums },
data () {
return {
albums: { items: [] },
- index_list: [],
-
- show_details_modal: false,
- selected_album: {}
+ index_list: []
}
},
@@ -91,25 +66,12 @@ export default {
albums_filtered () {
return this.albums.items.filter(album => !this.hide_singles || album.track_count > 2)
- },
-
- is_visible_artwork () {
- return this.$store.getters.settings_option('webinterface', 'show_cover_artwork_in_album_lists').value
}
},
methods: {
update_hide_singles: function (e) {
this.$store.commit(types.HIDE_SINGLES, !this.hide_singles)
- },
-
- open_album: function (album) {
- this.$router.push({ path: '/music/albums/' + album.id })
- },
-
- open_dialog: function (album) {
- this.selected_album = album
- this.show_details_modal = true
}
},
diff --git a/web-src/src/pages/PageArtist.vue b/web-src/src/pages/PageArtist.vue
index 5e240931..8056fce7 100644
--- a/web-src/src/pages/PageArtist.vue
+++ b/web-src/src/pages/PageArtist.vue
@@ -15,24 +15,7 @@
@@ -41,10 +24,8 @@
diff --git a/web-src/src/pages/PageAudiobooksArtist.vue b/web-src/src/pages/PageAudiobooksArtist.vue
new file mode 100644
index 00000000..fdbd98f7
--- /dev/null
+++ b/web-src/src/pages/PageAudiobooksArtist.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
diff --git a/web-src/src/pages/PageAudiobooksArtists.vue b/web-src/src/pages/PageAudiobooksArtists.vue
index ba3d3f0f..3d94cc6a 100644
--- a/web-src/src/pages/PageAudiobooksArtists.vue
+++ b/web-src/src/pages/PageAudiobooksArtists.vue
@@ -13,17 +13,7 @@