diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-06 16:21:55 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-06 16:21:55 -0400 |
| commit | c431625d3950655178a054cc9870d84161ee2b90 (patch) | |
| tree | 3541045d66918b34682a42c7027bcfa24b7129e3 | |
| parent | c652d16780d9bd9ee8cc8b238109d95fb3056875 (diff) | |
update components
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Season.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/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 29db5fd55..a6894f515 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<BaseItem> GetRecursiveChildren(User user, Func<BaseItem, bool> 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 88cb9b1be..ce06dc0b3 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -164,7 +164,9 @@ <Content Include="dashboard-ui\css\images\logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\css\polymer\paper-icon-button-light.css" />
+ <Content Include="dashboard-ui\css\polymer\paper-icon-button-light.css">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\devices\windowsphone\wp.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|