alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-29 19:11:00 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #1898 from Bond-009/jsonfix

Browse Source 
Fix Json serialization error

(cherry picked from commit 91600b1c81)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface
2019-10-20 15:16:01 -04:00
committed by Joshua Boniface
parent 86a50367b2
commit 6e59671cf6
44 changed files with 364 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/Entities/UserRootFolder.cs
View File

@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Library;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Controller.Entities
{
@@ -33,10 +33,10 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsInheritedParentImages => false;
[IgnoreDataMember]
[JsonIgnore]
public override bool SupportsPlayedStatus => false;
private void ClearCache()
@@ -75,10 +75,10 @@ namespace MediaBrowser.Controller.Entities
return GetChildren(user, true).Count;
}
[IgnoreDataMember]
[JsonIgnore]
protected override bool SupportsShortcutChildren => true;
[IgnoreDataMember]
[JsonIgnore]
public override bool IsPreSorted => true;
protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)