Merge branch '1006-adding-album-mixes-up-tracks-if-multiple-discs-present' into 'develop'

Resolve "Adding album mixes up tracks if multiple discs present"

Closes #1006

See merge request funkwhale/funkwhale!984
environments/review-front-serv-f1ybnc/deployments/3672
Eliot Berriot 2020-01-06 10:11:26 +01:00
commit 758d788491
2 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -0,0 +1 @@
Resolve an issue where disc numbers were not taken into consideration when playing an album from the album card (#1006)

Wyświetl plik

@ -189,10 +189,10 @@ export default {
resolve(tracks)
})
} else if (self.artist) {
let params = {'artist': self.artist.id, 'ordering': 'album__release_date,position'}
let params = {'artist': self.artist.id, 'ordering': 'album__release_date,disc_number,position'}
self.getTracksPage(1, params, resolve)
} else if (self.album) {
let params = {'album': self.album.id, 'ordering': 'position'}
let params = {'album': self.album.id, 'ordering': 'disc_number,position'}
self.getTracksPage(1, params, resolve)
}
})