wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport pull request #7496 from jellyfin-web/release-10.11.z

Browse Source 
Fix missing server id

Original-merge: a82ae33aa3619ef86eeac4ef108be67b3ca5529f

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: thornbill <thornbill@users.noreply.github.com>
This commit is contained in:
thornbill
2026-01-15 13:40:30 -05:00
parent 5ec2eff99a
commit 3fbf765437
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/cardbuilder/cardBuilder.js
+2 -1
View File
@@ -578,9 +578,10 @@ function getCardFooterText(item, apiClient, options, footerClass, progressHtml,
if (flags.isOuterFooter && item.AlbumArtists?.length) {
const artistText = item.AlbumArtists
.map(artist => {
artist.ServerId = serverId;
artist.Type = BaseItemKind.MusicArtist;
artist.IsFolder = true;
return getTextActionButton(artist, null, serverId);
return getTextActionButton(artist);
})
.join(' / ');
lines.push(artistText);
src/components/router/appRouter.js
+15 -15
View File
@@ -262,15 +262,15 @@ class AppRouter {
}
if (item === 'recordedtv') {
return '#/livetv?tab=3&serverId=' + options.serverId;
return '#/livetv?tab=3&serverId=' + serverId;
}
if (item === 'nextup') {
return '#/list?type=nextup&serverId=' + options.serverId;
return '#/list?type=nextup&serverId=' + serverId;
}
if (item === 'list') {
let urlForList = '#/list?serverId=' + options.serverId + '&type=' + options.itemTypes;
let urlForList = '#/list?serverId=' + serverId + '&type=' + options.itemTypes;
if (options.isFavorite) {
urlForList += '&IsFavorite=true';
@@ -305,49 +305,49 @@ class AppRouter {
if (item === 'livetv') {
if (options.section === 'programs') {
return '#/livetv?tab=0&serverId=' + options.serverId;
return '#/livetv?tab=0&serverId=' + serverId;
}
if (options.section === 'guide') {
return '#/livetv?tab=1&serverId=' + options.serverId;
return '#/livetv?tab=1&serverId=' + serverId;
}
if (options.section === 'movies') {
return '#/list?type=Programs&IsMovie=true&serverId=' + options.serverId;
return '#/list?type=Programs&IsMovie=true&serverId=' + serverId;
}
if (options.section === 'shows') {
return '#/list?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + options.serverId;
return '#/list?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + serverId;
}
if (options.section === 'sports') {
return '#/list?type=Programs&IsSports=true&serverId=' + options.serverId;
return '#/list?type=Programs&IsSports=true&serverId=' + serverId;
}
if (options.section === 'kids') {
return '#/list?type=Programs&IsKids=true&serverId=' + options.serverId;
return '#/list?type=Programs&IsKids=true&serverId=' + serverId;
}
if (options.section === 'news') {
return '#/list?type=Programs&IsNews=true&serverId=' + options.serverId;
return '#/list?type=Programs&IsNews=true&serverId=' + serverId;
}
if (options.section === 'onnow') {
return '#/list?type=Programs&IsAiring=true&serverId=' + options.serverId;
return '#/list?type=Programs&IsAiring=true&serverId=' + serverId;
}
if (options.section === 'channels') {
return '#/livetv?tab=2&serverId=' + options.serverId;
return '#/livetv?tab=2&serverId=' + serverId;
}
if (options.section === 'dvrschedule') {
return '#/livetv?tab=4&serverId=' + options.serverId;
return '#/livetv?tab=4&serverId=' + serverId;
}
if (options.section === 'seriesrecording') {
return '#/livetv?tab=5&serverId=' + options.serverId;
return '#/livetv?tab=5&serverId=' + serverId;
}
return '#/livetv?serverId=' + options.serverId;
return '#/livetv?serverId=' + serverId;
}
if (itemType == 'SeriesTimer') {