Luke Pulverenti преди 9 години
родител
ревизия
ab06f59275
променени са 2 файла, в които са добавени 2 реда и са изтрити 9 реда
  1. 1 8
      MediaBrowser.Controller/Entities/User.cs
  2. 1 1
      MediaBrowser.Server.Implementations/Library/LibraryManager.cs

+ 1 - 8
MediaBrowser.Controller/Entities/User.cs

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

+ 1 - 1
MediaBrowser.Server.Implementations/Library/LibraryManager.cs

@@ -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[] { };