content, data: Album.showArtistsInTrackList

2 files changed, 13 insertions, 9 deletions

diff --git a/src/content/dependencies/generateAlbumTrackListItem.js b/src/content/dependencies/generateAlbumTrackListItem.js
index e72d49b8..7024284b 100644
--- a/src/content/dependencies/generateAlbumTrackListItem.js
+++ b/src/content/dependencies/generateAlbumTrackListItem.js
@@ -21,6 +21,8 @@ export default {
   }),
 
   data: (query, track, album) => ({
+    albumShowsTrackArtists: album.showArtistsInTrackList,
+
     trackHasDuration: query.trackHasDuration,
     sectionHasDuration: query.sectionHasDuration,
     albumHasDuration: query.albumHasDuration,
@@ -40,7 +42,11 @@ export default {
 
   generate: (data, relations, slots) =>
     relations.item.slots({
-      showArtists: 'auto',
+      showArtists:
+        (data.albumShowsTrackArtists
+          ? 'auto'
+          : false),
+
       showDetail: true,
 
       showDuration:
diff --git a/src/data/things/album/Album.js b/src/data/things/album/Album.js
index 1ae10ab1..d712fb0b 100644
--- a/src/data/things/album/Album.js
+++ b/src/data/things/album/Album.js
@@ -171,12 +171,12 @@ export class Album extends Thing {
 
     countTracksInArtistTotals: flag(V(true)),
 
-    showAlbumInTracksWithoutArtists: flag(V(false)),
-
-    hasTrackNumbers: flag(V(true)),
     isListedOnHomepage: flag(V(true)),
     isListedInGalleries: flag(V(true)),
 
+    hasTrackNumbers: flag(V(true)),
+    showAlbumInTracksWithoutArtists: flag(V(false)),
+    showArtistsInTrackList: flag(V(true)),
     hideDuration: flag(V(false)),
 
     // > Update & expose - General metadata
@@ -638,14 +638,12 @@ export class Album extends Thing {
 
       'Count Tracks In Artist Totals': {property: 'countTracksInArtistTotals'},
 
-      'Show Album In Tracks Without Artists': {
-        property: 'showAlbumInTracksWithoutArtists',
-      },
-
-      'Has Track Numbers': {property: 'hasTrackNumbers'},
       'Listed on Homepage': {property: 'isListedOnHomepage'},
       'Listed in Galleries': {property: 'isListedInGalleries'},
 
+      'Has Track Numbers': {property: 'hasTrackNumbers'},
+      'Show Album In Tracks Without Artists': {property: 'showAlbumInTracksWithoutArtists'},
+      'Show Artists In Track List': {property: 'showArtistsInTrackList'},
       'Hide Duration': {property: 'hideDuration'},
 
       // General metadata