« get me outta code hell

Merge branch 'staging' into preview - hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/listing-spec.js
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2023-01-15 20:37:01 -0400
committer(quasar) nebula <qznebula@protonmail.com>2023-01-15 20:37:01 -0400
commit3daff0953b88de9ae0fffa1b928c4945e8902a09 (patch)
tree8b9aea91cb06c49d323241b6357a6235d1e332ed /src/listing-spec.js
parent088a0d4ef42c90d6e81586601ee6cb37340b5bf4 (diff)
parenta526ae6ac12e912374ff812c0ab89c70c7943df7 (diff)
Merge branch 'staging' into preview
Diffstat (limited to 'src/listing-spec.js')
-rw-r--r--src/listing-spec.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/listing-spec.js b/src/listing-spec.js
index 1538757..ef51fe9 100644
--- a/src/listing-spec.js
+++ b/src/listing-spec.js
@@ -617,9 +617,12 @@ const listingSpec = [
     directory: 'tracks/by-date',
     stringsKey: 'listTracks.byDate',
 
-    data: ({wikiData: {trackData}}) =>
+    data: ({wikiData: {albumData}}) =>
       chunkByProperties(
-        sortChronologically(trackData.filter(t => t.date)),
+        sortByDate(
+          sortChronologically(albumData)
+            .flatMap(album => album.tracks)
+            .filter(track => track.date)),
         ['album', 'date']),
 
     html: (data, {html, language, link}) =>
@@ -634,7 +637,7 @@ const listingSpec = [
           html.tag('dd',
             html.tag('ul',
               tracks.map(track =>
-                track.aka
+                track.originalReleaseTrack
                   ? html.tag('li',
                       {class: 'rerelease'},
                       language.$('listingPage.listTracks.byDate.track.rerelease', {