michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1713 from MediaBrowser/dev

Browse Source 
update components
This commit is contained in:
Luke 2016-05-06 16:22:37 -04:00
commit b985873529
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@ -170,7 +170,9 @@ namespace MediaBrowser.Controller.Entities.TV
} }
else else
{ {
items = GetEpisodes(query.User).Where(filter); items = query.Recursive
? GetRecursiveChildren(user, filter)
: GetChildren(user, true).Where(filter);
} }
var result = PostFilterAndSort(items, query); var result = PostFilterAndSort(items, query);
@ -267,6 +269,11 @@ namespace MediaBrowser.Controller.Entities.TV
return GetEpisodes(user); 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) protected override bool GetBlockUnratedValue(UserPolicy config)
{ {
// Don't block. Let either the entire series rating or episode rating determine it // Don't block. Let either the entire series rating or episode rating determine it

4
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -164,7 +164,9 @@
<Content Include="dashboard-ui\css\images\logo.png"> <Content Include="dashboard-ui\css\images\logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </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"> <Content Include="dashboard-ui\devices\windowsphone\wp.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>