mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #3357 from SenorSmartyPants/MediaSourceCount
Display MediaSourceCount for all media Types
This commit is contained in:
commit
c5848b9934
5 changed files with 11 additions and 5 deletions
|
@ -607,7 +607,7 @@ import ServerConnections from '../ServerConnections';
|
||||||
oldestDateForNextUp.setDate(oldestDateForNextUp.getDate() - userSettings.maxDaysForNextUp());
|
oldestDateForNextUp.setDate(oldestDateForNextUp.getDate() - userSettings.maxDaysForNextUp());
|
||||||
return apiClient.getNextUpEpisodes({
|
return apiClient.getNextUpEpisodes({
|
||||||
Limit: enableScrollX() ? 24 : 15,
|
Limit: enableScrollX() ? 24 : 15,
|
||||||
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,Path',
|
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,Path,MediaSourceCount',
|
||||||
UserId: apiClient.getCurrentUserId(),
|
UserId: apiClient.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: 'Primary,Backdrop,Banner,Thumb',
|
EnableImageTypes: 'Primary,Backdrop,Banner,Thumb',
|
||||||
|
|
|
@ -282,6 +282,11 @@ import ServerConnections from '../ServerConnections';
|
||||||
html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options);
|
html += '<div class="' + imageClass + ' cardImageContainer ' + cardBuilder.getDefaultBackgroundClass(item.Name) + '">' + cardBuilder.getDefaultText(item, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const mediaSourceCount = item.MediaSourceCount || 1;
|
||||||
|
if (mediaSourceCount > 1 && options.disableIndicators !== true) {
|
||||||
|
html += '<div class="mediaSourceIndicator">' + mediaSourceCount + '</div>';
|
||||||
|
}
|
||||||
|
|
||||||
let indicatorsHtml = '';
|
let indicatorsHtml = '';
|
||||||
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
||||||
|
|
||||||
|
|
|
@ -868,7 +868,8 @@ function renderNextUp(page, item, user) {
|
||||||
|
|
||||||
ServerConnections.getApiClient(item.ServerId).getNextUpEpisodes({
|
ServerConnections.getApiClient(item.ServerId).getNextUpEpisodes({
|
||||||
SeriesId: item.Id,
|
SeriesId: item.Id,
|
||||||
UserId: user.Id
|
UserId: user.Id,
|
||||||
|
Fields: 'MediaSourceCount'
|
||||||
}).then(function (result) {
|
}).then(function (result) {
|
||||||
if (result.Items.length) {
|
if (result.Items.length) {
|
||||||
section.classList.remove('hide');
|
section.classList.remove('hide');
|
||||||
|
|
|
@ -254,7 +254,7 @@ import { appRouter } from '../components/appRouter';
|
||||||
if (params.type === 'nextup') {
|
if (params.type === 'nextup') {
|
||||||
return apiClient.getNextUpEpisodes(modifyQueryWithFilters(instance, {
|
return apiClient.getNextUpEpisodes(modifyQueryWithFilters(instance, {
|
||||||
Limit: limit,
|
Limit: limit,
|
||||||
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo',
|
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,MediaSourceCount',
|
||||||
UserId: apiClient.getCurrentUserId(),
|
UserId: apiClient.getCurrentUserId(),
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: 'Primary,Backdrop,Thumb',
|
EnableImageTypes: 'Primary,Backdrop,Thumb',
|
||||||
|
@ -323,7 +323,7 @@ import { appRouter } from '../components/appRouter';
|
||||||
return apiClient.getItems(apiClient.getCurrentUserId(), modifyQueryWithFilters(instance, {
|
return apiClient.getItems(apiClient.getCurrentUserId(), modifyQueryWithFilters(instance, {
|
||||||
StartIndex: startIndex,
|
StartIndex: startIndex,
|
||||||
Limit: limit,
|
Limit: limit,
|
||||||
Fields: 'PrimaryImageAspectRatio,SortName,Path,SongCount,ChildCount',
|
Fields: 'PrimaryImageAspectRatio,SortName,Path,SongCount,ChildCount,MediaSourceCount',
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
ParentId: item.Id,
|
ParentId: item.Id,
|
||||||
SortBy: sortBy
|
SortBy: sortBy
|
||||||
|
|
|
@ -178,7 +178,7 @@ import autoFocuser from '../../components/autoFocuser';
|
||||||
const query = {
|
const query = {
|
||||||
userId: userId,
|
userId: userId,
|
||||||
Limit: 24,
|
Limit: 24,
|
||||||
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo',
|
Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,MediaSourceCount',
|
||||||
ParentId: parentId,
|
ParentId: parentId,
|
||||||
ImageTypeLimit: 1,
|
ImageTypeLimit: 1,
|
||||||
EnableImageTypes: 'Primary,Backdrop,Thumb',
|
EnableImageTypes: 'Primary,Backdrop,Thumb',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue