diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-28 23:56:20 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-28 23:56:20 -0400 |
| commit | e9fb806478e974b200b54f8acff5eb09bdef4c32 (patch) | |
| tree | 6b83c4728d93eb4bc26331d946f500243f5a1f24 /MediaBrowser.Api/UserLibrary/ItemsService.cs | |
| parent | 0f4c28c120751e1cf6e0562ef0445c7fa46cf0a4 (diff) | |
3.0.5231.40980
Diffstat (limited to 'MediaBrowser.Api/UserLibrary/ItemsService.cs')
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 1682afb10..8f3016769 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -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)) { |