From c431625d3950655178a054cc9870d84161ee2b90 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 6 May 2016 16:21:55 -0400 Subject: [PATCH] update components --- MediaBrowser.Controller/Entities/TV/Season.cs | 9 ++++++++- .../MediaBrowser.WebDashboard.csproj | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 29db5fd550..a6894f5150 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -170,7 +170,9 @@ namespace MediaBrowser.Controller.Entities.TV } else { - items = GetEpisodes(query.User).Where(filter); + items = query.Recursive + ? GetRecursiveChildren(user, filter) + : GetChildren(user, true).Where(filter); } var result = PostFilterAndSort(items, query); @@ -267,6 +269,11 @@ namespace MediaBrowser.Controller.Entities.TV return GetEpisodes(user); } + public override IEnumerable GetRecursiveChildren(User user, Func filter) + { + return GetEpisodes(user).Where(filter); + } + protected override bool GetBlockUnratedValue(UserPolicy config) { // Don't block. Let either the entire series rating or episode rating determine it diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 88cb9b1bea..ce06dc0b35 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -164,7 +164,9 @@ PreserveNewest - + + PreserveNewest + PreserveNewest