alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 10:04:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix block by inherited tags

Browse Source
This commit is contained in:
Luke Pulverenti
2016-04-14 22:39:39 -04:00
parent 57e3bb72f9
commit 7f2b2e1b9a
3 changed files with 144 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1348,6 +1348,24 @@ namespace MediaBrowser.Controller.Entities
return LocalizationManager.GetRatingLevel(rating);
}
public List<string> GetInheritedTags()
{
var list = new List<string>();
list.AddRange(Tags);
foreach (var parent in GetParents())
{
list.AddRange(parent.Tags);
}
foreach (var parent in LibraryManager.GetCollectionFolders(this))
{
list.AddRange(parent.Tags);
}
return list.Distinct(StringComparer.OrdinalIgnoreCase).ToList();
}
private bool IsVisibleViaTags(User user)
{
var hasTags = this as IHasTags;

4
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@@ -33,6 +33,7 @@ namespace MediaBrowser.Controller.Entities
public string[] IncludeItemTypes { get; set; }
public string[] ExcludeItemTypes { get; set; }
public string[] ExcludeTags { get; set; }
public string[] ExcludeInheritedTags { get; set; }
public string[] Genres { get; set; }
public bool? IsMissing { get; set; }
@@ -157,6 +158,7 @@ namespace MediaBrowser.Controller.Entities
AncestorIds = new string[] { };
TopParentIds = new string[] { };
ExcludeTags = new string[] { };
ExcludeInheritedTags = new string[] { };
LocationTypes = new LocationType[] { };
ExcludeLocationTypes = new LocationType[] { };
PresetViews = new string[] { };
@@ -181,7 +183,7 @@ namespace MediaBrowser.Controller.Entities
BlockUnratedItems = policy.BlockUnratedItems;
}
ExcludeTags = policy.BlockedTags;
ExcludeInheritedTags = policy.BlockedTags;
User = user;
}