From 3fbf7654372a1830c414e54ba3bfdfad1cb26ae1 Mon Sep 17 00:00:00 2001 From: thornbill Date: Thu, 15 Jan 2026 13:40:30 -0500 Subject: [PATCH] Backport pull request #7496 from jellyfin-web/release-10.11.z Fix missing server id Original-merge: a82ae33aa3619ef86eeac4ef108be67b3ca5529f Merged-by: thornbill Backported-by: thornbill --- src/components/cardbuilder/cardBuilder.js | 3 ++- src/components/router/appRouter.js | 30 +++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 6e92acfb2..9b7392d7f 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -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); diff --git a/src/components/router/appRouter.js b/src/components/router/appRouter.js index 8d90531fd..46c975aad 100644 --- a/src/components/router/appRouter.js +++ b/src/components/router/appRouter.js @@ -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') {