starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 14:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

3.0.5231.40980

Browse Source
This commit is contained in:
Luke Pulverenti
2014-04-28 23:56:20 -04:00
parent 0f4c28c120
commit e9fb806478
38 changed files with 1197 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@@ -321,7 +321,7 @@ namespace MediaBrowser.Api.UserLibrary
items = items.AsEnumerable();
if (CollapseBoxSetItems(request, parentItem))
if (CollapseBoxSetItems(request, parentItem, user))
{
items = _collectionManager.CollapseItemsWithinBoxSets(items, user);
}
@@ -349,7 +349,7 @@ namespace MediaBrowser.Api.UserLibrary
};
}
private bool CollapseBoxSetItems(GetItems request, BaseItem parentItem)
private bool CollapseBoxSetItems(GetItems request, BaseItem parentItem, User user)
{
// Could end up stuck in a loop like this
if (parentItem is BoxSet)
@@ -361,6 +361,11 @@ namespace MediaBrowser.Api.UserLibrary
if (!param.HasValue)
{
if (user != null && !user.Configuration.GroupMoviesIntoBoxSets)
{
return false;
}
if (!string.IsNullOrWhiteSpace(request.IncludeItemTypes) &&
request.IncludeItemTypes.Split(',').Contains("Movie", StringComparer.OrdinalIgnoreCase))
{