lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dialogs

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-18 13:02:56 -04:00
parent d1d0487fee
commit ab06f59275
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/User.cs
View File

@ -305,14 +305,7 @@ namespace MediaBrowser.Controller.Entities
public bool IsFolderGrouped(Guid id) public bool IsFolderGrouped(Guid id)
{ {
var config = Configuration; return Configuration.GroupedFolders.Select(i => new Guid(i)).Contains(id);
if (config.ExcludeFoldersFromGrouping != null)
{
return !config.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).Contains(id);
}
return config.GroupedFolders.Select(i => new Guid(i)).Contains(id);
} }
[IgnoreDataMember] [IgnoreDataMember]

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1452,7 +1452,7 @@ namespace MediaBrowser.Server.Implementations.Library
.GetChildren(user, true) .GetChildren(user, true)
.OfType<CollectionFolder>() .OfType<CollectionFolder>()
.Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase)) .Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase))
.Where(i => user.Configuration.GroupedFolders.Contains(i.Id.ToString("N"), StringComparer.OrdinalIgnoreCase)) .Where(i => user.IsFolderGrouped(i.Id))
.SelectMany(i => GetTopParentsForQuery(i, user)); .SelectMany(i => GetTopParentsForQuery(i, user));
} }
return new BaseItem[] { }; return new BaseItem[] { };